From 485e96e9c31bbd658bf7fcfb8e9518c2cac752dc Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 10 六月 2026 18:12:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTime.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActZone.txt | 2 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 14 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActType.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTimeFlow.txt | 3 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Lianqi.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt | 9 ++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt | 9 ++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 14 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTimeFlow.txt | 3 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActZone.txt | 2 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLianqi.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt | 11 +++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTime.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt | 11 +++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActType.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc | 0
28 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 7e06e8d..bc2a3b4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 2cd9d5f..bd3d3ef 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index cd12bb6..b5d7078 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Lianqi.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Lianqi.pyc
index a7a8c4a..9687535 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Lianqi.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Lianqi.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
index 3755976..f119e73 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc
index e343b18..2ef8544 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldAction.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 17d4a4b..f6f4ba7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc
index 86c10ab..d9422e9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLianqi.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLianqi.pyc
index 1bf8dad..f87b8bf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLianqi.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLianqi.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
index cff4dcd..43393a1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.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 61a71b3..eafda8e 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/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index 82bcde1..6d06920 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.pyc
index 60ff805..5ec8d1d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerZhanling.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index e152681..60c5ff9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTime.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTime.txt
index 9fa70d5..b6d742a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTime.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTime.txt
@@ -1,3 +1,4 @@
CfgID PlatformList ServerIDList ZoneSign ActNum StartDate EndDate ActFlow ActFuncType ActTempID
1 [] [] gcz_test 99 2026-5-1 2026-5-5 gcz 2 1
2 [] [] gcz_test 99 2026-6-1 2026-6-5 gcz 2 1
+3 [] [] test 99 2026-6-10 2026-6-10 lianqi 3 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTimeFlow.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTimeFlow.txt
index f2343aa..6b4a22b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTimeFlow.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTimeFlow.txt
@@ -11,3 +11,6 @@
gcz 4 10 0 4 21 59 32
gcz 4 22 0 4 22 04 33
gcz 4 22 5 5 23 59 99
+lianqi 1 0 0 1 9 59 90
+lianqi 1 10 0 1 21 59 1
+lianqi 1 22 0 1 23 59 99
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActType.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActType.txt
index d548ce3..b41413a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActType.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActType.txt
@@ -1,2 +1,3 @@
ActFuncType ActTempID JoinFamilyCnt ActShopType CTGIDList CTGAssistTempID GuessTempID PersonalTempID FamilyTemplID
2 1 48 25 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 2 2 1003 1004
+3 1 0 25 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 0 0 1003 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActZone.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActZone.txt
index a384a37..7bcbfcd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActZone.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActZone.txt
@@ -3,3 +3,5 @@
gcz_test 2 10002 [[101, 200]]
gcz_test 3 20001 [[1001, 2000]]
gcz_test 4 20001 [[9000, 9999]]
+test 1 10001 [[10, 100]]
+test 2 10002 [[101, 200]]
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 1294fe8..919aacb 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
@@ -358,9 +358,6 @@
FBQuickPass 1.1 [0,0,2] [0,0,10] 10
FortuneCompensate {1:[[181,5,0],[103,5,0],[106,4,0]],2:[[4151,40,0],[109,5,0],[112,5,0]],3:[[4152,75,0],[2700,10,0],[1,50,0]],4:[[4154,190,0],[182,950,0],[2701,40,0],[181,950,0]],5:[[3801,45,0],[103,180,0],[106,180,0]],6:[[2275,95,0],[604,900,0],[2348,47,0],[4152,4900,0]],7:[[4151,19500,0],[112,450,0],[3007,5,0]],8:[[2274,4,0],[4510,14500,0],[109,970,0],[3007,10,0]],9:[[4511,290,0],[2302,600,0],[3007,20,0]],10:[[5423,10,0],[4151,29500,0],[604,4000,0],[3007,45,0]],11:[[7541,180,0],[181,49500,0],[3009,5,0]],12:[[2450,3,0],[8354,1900,0],[4152,39200,0],[3009,9,0]],13:[[604,4900,0],[4511,480,0],[3009,13,0]],14:[[5409,2,0],[4151,58000,0],[2302,2470,0],[3009,17,0]],15:[[2450,7,0],[4150,55000,0],[8354,8000,0],[3009,0,0]],16:[[5417,4,0],[4511,1450,0],[4152,58000,0],[3003,4,0]],17:[[2462,15,0],[8354,5900,0],[3003,8,0]],18:[[7542,150,0],[7512,50000,0],[2275,2000,0],[3003,13,0]],19:[[83,1,0],[182,62000,0],[3410,90,0],[3003,18,0]],20:[[7542,180,0],[4150,48000,0],[3003,18,0]]}
MirrorAttack {} [] [] {}
-LianqiSet 200 65 {"2":[[4152,5,0]],"3":[[4152,5,0]],"4":[[4152,5,0],[20,10,0]],"5":[[4152,5,0],[20,10,0]],"6":[[4152,10,0],[20,10,0]],"7":[[4152,10,0],[20,50,0]],"8":[[4152,20,0],[20,50,0]],"9":[[4152,30,0],[20,100,0]],"10":[[4152,40,0],[20,100,0],[181,20,0]],"11":[[4152,50,0],[20,200,0],[181,40,0],[2221,1,0]],"12":[[4152,200,0],[181,100,0],[2457,10,0],[2219,1,0]],"13":[[4152,400,0],[181,200,0],[2457,10,0],[2219,1,0]]}
-LianqiUseItem [12000,12001,12002,12003] {"12000":20, "12001":20, "12002":20, "12003":999} 7 15 [12000,12001,12002,12003]
-LianqiRand 2 {(1,3):[[10000,1]],(4,5):[[8500,1],[10000,2]],(6,8):[[8500,1],[9700,2],[10000,3]],(9,9):[[8500,1],[9500,2],[9800,3],[10000,4]],(10,10):[[8500,1],[9500,2],[9700,3],[9850,4],[10000,5]],(11,13):[[8500,1],[9400,2],[9600,3],[9800,4],[10000,5]]}
EncodingTex 0 utf8
EventReport [] [1100,1101,9001]
CreateRole 主公%s
@@ -420,7 +417,7 @@
TurnMax 15 15 {}
AngerXP 50 100 50 5 {"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000)) int(min((dMissRate-aMissRateDef)/2*pow(0.7,missNum), 4000)) int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 4000))
-ParryCfg 0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000) [1,2] 0.5 2
+ParryCfg int(min((dParryRate-aParryRateDef)*pow(0.5,tagCnt), 8000)) [1,2] 0.5 2
GuanchuanCfg 100|1 1|50 3000
ZhaojiaCfg 100|1 1|50 3000
ComboCfg 0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum)) 0
@@ -473,9 +470,9 @@
QunyingCross 12
DeleteTestRebate ryzj 5 20260326 20261226 120
FmAtkDefBatSet [[1,2,5],[3,6],[4,7]] 5
-FmAtkDefBatPrepare 12 3|50000 4 2
-FmAtkDefBatAward [[16,100],[2,1000]] [[16,50],[2,500]] [[16,5000],[2,30000],[5,20],[4,50]] [[16,3000],[2,15000],[5,10],[4,25]]
-FmAtkDefBatTreasure {"2":9, "3":1} 40 5
+FmAtkDefBatPrepare 12 7|50000 4 2
+FmAtkDefBatAward [[45,200],[2,1000]] [[45,80],[2,500]] [[45,3000],[2,30000],[3,100],[1046,20]] [[45,3000],[2,15000],[3,50],[1046,10]]
+FmAtkDefBatTreasure {"2":9, "3":1} 40 6
FamilyGCZGroupSet {"48": {"1": {"1": [4,6,0]}, "2": {"1": [2,6,0], "2": [2,6,0]}, "3": {"1": [1,0,0], "2": [2,0,0], "3": [1,0,0]}}, "72": {"1": {"1": [6,6,0]}, "2": {"1": [3,4,0], "2": [3,4,4]}, "3": {"1": [3,0,0], "2": [2,0,0], "3": [1,0,0]}}} {"1":{"1":1200, "2":1000, "3":800, "4":600, "6":400, "9":200, "12":150}, "2":{"1":1680, "2":1400, "3":1120, "4":840, "6":560, "9":280, "12":200}, "3":{"1":3550, "2":3230, "3":2940, "4":2670, "6":2430, "9":2210, "12":2000}}
FamilyGCZXiuluo 10000000000 100 150 [3]
FamilyGCZCity 20 3 int(memHurtTotal*(1+cityRemainHPPer*1.5))
@@ -486,3 +483,6 @@
FamilyGCZContributionHigh 25 5 [[500, [1,15]],[1000, [1,25]],[1500, [2,150]],[2000, [2,250]],[2000, [3,15]],[1000, [3,25]],[2000, [7,1500]]]
FamilyGCZGuess [23,31] 10 3 [[1,50]]
FamilyGCZItem 202 []
+LianqiSet 200 65 {"2":[[1,5]],"3":[[2,5]],"4":[[1,5],[2,10]],"5":[[1,5],[3,10]],"6":[[1,10],[2,10]],"7":[[1,10],[2,50]],"8":[[1,20],[3,50]],"9":[[1,30],[2,100]],"10":[[1,40],[2,100],[3,20]],"11":[[1,50],[2,200],[3,40],[4,1]],"12":[[1,200],[2,100],[3,10],[4,1]],"13":[[1,300],[2,200],[3,10,],[4,1]]}
+LianqiUseItem [36,37,38,39] {"36":20, "37":20, "38":20, "39":999} 7 15 [36,37,38]
+LianqiRand 2 {(1,3):[[10000,1]],(4,5):[[8500,1],[10000,2]],(6,8):[[8500,1],[9700,2],[10000,3]],(9,9):[[8500,1],[9500,2],[9800,3],[10000,4]],(10,10):[[8500,1],[9500,2],[9700,3],[9850,4],[10000,5]],(11,13):[[8500,1],[9400,2],[9600,3],[9800,4],[10000,5]]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt
index 2ac2429..c1f9275 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt
@@ -202,3 +202,12 @@
7024 29 20 1 [] 0 20 38 0 100 0 0 0
7025 29 5 1 [] 0 19 38 0 100 0 0 0
7026 29 3 10 [] 0 50 38 0 40 0 0 0
+11000 100 3 25 [] 2 1 45 0 0 0 0 0
+11001 100 1046 10 [] 2 5 45 0 500 0 0 0
+11002 100 13 20 [] 2 20 45 0 200 0 0 0
+11003 100 20 5 [] 2 10 45 0 300 0 0 0
+11004 100 2 15000 [] 2 10 45 0 100 0 0 0
+11005 100 1029 1 [] 2 10 45 0 250 0 0 0
+11006 100 200 10 [] 2 50 45 0 50 0 0 0
+11007 100 21 10 [] 2 50 45 0 50 0 0 0
+11008 100 7 500 [] 2 99 45 0 10 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt
index a154b73..e5d6309 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Zhanling.txt
@@ -124,6 +124,17 @@
8 3610 17 [[31,10]] [[31,30],[30,240]] []
8 3810 18 [[30,10]] [[31,35],[30,280]] []
8 4010 19 [[31,10]] [[31,35],[30,280]] []
+9 100 0 [[1,10]] [[2,1000]] [[3,50], [7,100]]
+9 200 1 [[1,11]] [[2,1100]] [[3,50], [7,200]]
+9 500 2 [[1,12]] [[2,1200]] [[3,50], [7,300]]
+9 1000 3 [[1,13]] [[2,1300]] [[3,50], [7,400]]
+9 2000 4 [[1,14]] [[2,1400]] [[3,50], [7,500]]
+9 3000 5 [[1,15]] [[2,1500]] [[3,50], [7,600]]
+9 4000 6 [[1,16]] [[2,1600]] [[3,50], [7,700]]
+9 5000 7 [[1,17]] [[2,1700]] [[3,50], [7,800]]
+9 6000 8 [[1,18]] [[2,1800]] [[3,50], [7,900]]
+9 7000 9 [[1,19]] [[2,1900]] [[3,50], [7,1000]]
+9 10000 10 [[1,20]] [[2,2000]] [[3,50], [7,1100]]
100 10 0 [[501,1]] [[501,5]] [[501,10],[501,10]]
100 20 1 [[501,1]] [[501,5]] [[501,10],[501,10]]
100 30 2 [[501,1]] [[501,5]] [[501,10],[501,10]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTime.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTime.txt
index 9fa70d5..b6d742a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTime.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTime.txt
@@ -1,3 +1,4 @@
CfgID PlatformList ServerIDList ZoneSign ActNum StartDate EndDate ActFlow ActFuncType ActTempID
1 [] [] gcz_test 99 2026-5-1 2026-5-5 gcz 2 1
2 [] [] gcz_test 99 2026-6-1 2026-6-5 gcz 2 1
+3 [] [] test 99 2026-6-10 2026-6-10 lianqi 3 1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTimeFlow.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTimeFlow.txt
index f2343aa..6b4a22b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTimeFlow.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTimeFlow.txt
@@ -11,3 +11,6 @@
gcz 4 10 0 4 21 59 32
gcz 4 22 0 4 22 04 33
gcz 4 22 5 5 23 59 99
+lianqi 1 0 0 1 9 59 90
+lianqi 1 10 0 1 21 59 1
+lianqi 1 22 0 1 23 59 99
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActType.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActType.txt
index d548ce3..b41413a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActType.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActType.txt
@@ -1,2 +1,3 @@
ActFuncType ActTempID JoinFamilyCnt ActShopType CTGIDList CTGAssistTempID GuessTempID PersonalTempID FamilyTemplID
2 1 48 25 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 2 2 1003 1004
+3 1 0 25 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 0 0 1003 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActZone.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActZone.txt
index a384a37..7bcbfcd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActZone.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActZone.txt
@@ -3,3 +3,5 @@
gcz_test 2 10002 [[101, 200]]
gcz_test 3 20001 [[1001, 2000]]
gcz_test 4 20001 [[9000, 9999]]
+test 1 10001 [[10, 100]]
+test 2 10002 [[101, 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 1294fe8..919aacb 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
@@ -358,9 +358,6 @@
FBQuickPass 1.1 [0,0,2] [0,0,10] 10
FortuneCompensate {1:[[181,5,0],[103,5,0],[106,4,0]],2:[[4151,40,0],[109,5,0],[112,5,0]],3:[[4152,75,0],[2700,10,0],[1,50,0]],4:[[4154,190,0],[182,950,0],[2701,40,0],[181,950,0]],5:[[3801,45,0],[103,180,0],[106,180,0]],6:[[2275,95,0],[604,900,0],[2348,47,0],[4152,4900,0]],7:[[4151,19500,0],[112,450,0],[3007,5,0]],8:[[2274,4,0],[4510,14500,0],[109,970,0],[3007,10,0]],9:[[4511,290,0],[2302,600,0],[3007,20,0]],10:[[5423,10,0],[4151,29500,0],[604,4000,0],[3007,45,0]],11:[[7541,180,0],[181,49500,0],[3009,5,0]],12:[[2450,3,0],[8354,1900,0],[4152,39200,0],[3009,9,0]],13:[[604,4900,0],[4511,480,0],[3009,13,0]],14:[[5409,2,0],[4151,58000,0],[2302,2470,0],[3009,17,0]],15:[[2450,7,0],[4150,55000,0],[8354,8000,0],[3009,0,0]],16:[[5417,4,0],[4511,1450,0],[4152,58000,0],[3003,4,0]],17:[[2462,15,0],[8354,5900,0],[3003,8,0]],18:[[7542,150,0],[7512,50000,0],[2275,2000,0],[3003,13,0]],19:[[83,1,0],[182,62000,0],[3410,90,0],[3003,18,0]],20:[[7542,180,0],[4150,48000,0],[3003,18,0]]}
MirrorAttack {} [] [] {}
-LianqiSet 200 65 {"2":[[4152,5,0]],"3":[[4152,5,0]],"4":[[4152,5,0],[20,10,0]],"5":[[4152,5,0],[20,10,0]],"6":[[4152,10,0],[20,10,0]],"7":[[4152,10,0],[20,50,0]],"8":[[4152,20,0],[20,50,0]],"9":[[4152,30,0],[20,100,0]],"10":[[4152,40,0],[20,100,0],[181,20,0]],"11":[[4152,50,0],[20,200,0],[181,40,0],[2221,1,0]],"12":[[4152,200,0],[181,100,0],[2457,10,0],[2219,1,0]],"13":[[4152,400,0],[181,200,0],[2457,10,0],[2219,1,0]]}
-LianqiUseItem [12000,12001,12002,12003] {"12000":20, "12001":20, "12002":20, "12003":999} 7 15 [12000,12001,12002,12003]
-LianqiRand 2 {(1,3):[[10000,1]],(4,5):[[8500,1],[10000,2]],(6,8):[[8500,1],[9700,2],[10000,3]],(9,9):[[8500,1],[9500,2],[9800,3],[10000,4]],(10,10):[[8500,1],[9500,2],[9700,3],[9850,4],[10000,5]],(11,13):[[8500,1],[9400,2],[9600,3],[9800,4],[10000,5]]}
EncodingTex 0 utf8
EventReport [] [1100,1101,9001]
CreateRole 主公%s
@@ -420,7 +417,7 @@
TurnMax 15 15 {}
AngerXP 50 100 50 5 {"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000)) int(min((dMissRate-aMissRateDef)/2*pow(0.7,missNum), 4000)) int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 4000))
-ParryCfg 0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000) [1,2] 0.5 2
+ParryCfg int(min((dParryRate-aParryRateDef)*pow(0.5,tagCnt), 8000)) [1,2] 0.5 2
GuanchuanCfg 100|1 1|50 3000
ZhaojiaCfg 100|1 1|50 3000
ComboCfg 0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum)) 0
@@ -473,9 +470,9 @@
QunyingCross 12
DeleteTestRebate ryzj 5 20260326 20261226 120
FmAtkDefBatSet [[1,2,5],[3,6],[4,7]] 5
-FmAtkDefBatPrepare 12 3|50000 4 2
-FmAtkDefBatAward [[16,100],[2,1000]] [[16,50],[2,500]] [[16,5000],[2,30000],[5,20],[4,50]] [[16,3000],[2,15000],[5,10],[4,25]]
-FmAtkDefBatTreasure {"2":9, "3":1} 40 5
+FmAtkDefBatPrepare 12 7|50000 4 2
+FmAtkDefBatAward [[45,200],[2,1000]] [[45,80],[2,500]] [[45,3000],[2,30000],[3,100],[1046,20]] [[45,3000],[2,15000],[3,50],[1046,10]]
+FmAtkDefBatTreasure {"2":9, "3":1} 40 6
FamilyGCZGroupSet {"48": {"1": {"1": [4,6,0]}, "2": {"1": [2,6,0], "2": [2,6,0]}, "3": {"1": [1,0,0], "2": [2,0,0], "3": [1,0,0]}}, "72": {"1": {"1": [6,6,0]}, "2": {"1": [3,4,0], "2": [3,4,4]}, "3": {"1": [3,0,0], "2": [2,0,0], "3": [1,0,0]}}} {"1":{"1":1200, "2":1000, "3":800, "4":600, "6":400, "9":200, "12":150}, "2":{"1":1680, "2":1400, "3":1120, "4":840, "6":560, "9":280, "12":200}, "3":{"1":3550, "2":3230, "3":2940, "4":2670, "6":2430, "9":2210, "12":2000}}
FamilyGCZXiuluo 10000000000 100 150 [3]
FamilyGCZCity 20 3 int(memHurtTotal*(1+cityRemainHPPer*1.5))
@@ -486,3 +483,6 @@
FamilyGCZContributionHigh 25 5 [[500, [1,15]],[1000, [1,25]],[1500, [2,150]],[2000, [2,250]],[2000, [3,15]],[1000, [3,25]],[2000, [7,1500]]]
FamilyGCZGuess [23,31] 10 3 [[1,50]]
FamilyGCZItem 202 []
+LianqiSet 200 65 {"2":[[1,5]],"3":[[2,5]],"4":[[1,5],[2,10]],"5":[[1,5],[3,10]],"6":[[1,10],[2,10]],"7":[[1,10],[2,50]],"8":[[1,20],[3,50]],"9":[[1,30],[2,100]],"10":[[1,40],[2,100],[3,20]],"11":[[1,50],[2,200],[3,40],[4,1]],"12":[[1,200],[2,100],[3,10],[4,1]],"13":[[1,300],[2,200],[3,10,],[4,1]]}
+LianqiUseItem [36,37,38,39] {"36":20, "37":20, "38":20, "39":999} 7 15 [36,37,38]
+LianqiRand 2 {(1,3):[[10000,1]],(4,5):[[8500,1],[10000,2]],(6,8):[[8500,1],[9700,2],[10000,3]],(9,9):[[8500,1],[9500,2],[9800,3],[10000,4]],(10,10):[[8500,1],[9500,2],[9700,3],[9850,4],[10000,5]],(11,13):[[8500,1],[9400,2],[9600,3],[9800,4],[10000,5]]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt
index 2ac2429..c1f9275 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt
@@ -202,3 +202,12 @@
7024 29 20 1 [] 0 20 38 0 100 0 0 0
7025 29 5 1 [] 0 19 38 0 100 0 0 0
7026 29 3 10 [] 0 50 38 0 40 0 0 0
+11000 100 3 25 [] 2 1 45 0 0 0 0 0
+11001 100 1046 10 [] 2 5 45 0 500 0 0 0
+11002 100 13 20 [] 2 20 45 0 200 0 0 0
+11003 100 20 5 [] 2 10 45 0 300 0 0 0
+11004 100 2 15000 [] 2 10 45 0 100 0 0 0
+11005 100 1029 1 [] 2 10 45 0 250 0 0 0
+11006 100 200 10 [] 2 50 45 0 50 0 0 0
+11007 100 21 10 [] 2 50 45 0 50 0 0 0
+11008 100 7 500 [] 2 99 45 0 10 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt
index a154b73..e5d6309 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt
@@ -124,6 +124,17 @@
8 3610 17 [[31,10]] [[31,30],[30,240]] []
8 3810 18 [[30,10]] [[31,35],[30,280]] []
8 4010 19 [[31,10]] [[31,35],[30,280]] []
+9 100 0 [[1,10]] [[2,1000]] [[3,50], [7,100]]
+9 200 1 [[1,11]] [[2,1100]] [[3,50], [7,200]]
+9 500 2 [[1,12]] [[2,1200]] [[3,50], [7,300]]
+9 1000 3 [[1,13]] [[2,1300]] [[3,50], [7,400]]
+9 2000 4 [[1,14]] [[2,1400]] [[3,50], [7,500]]
+9 3000 5 [[1,15]] [[2,1500]] [[3,50], [7,600]]
+9 4000 6 [[1,16]] [[2,1600]] [[3,50], [7,700]]
+9 5000 7 [[1,17]] [[2,1700]] [[3,50], [7,800]]
+9 6000 8 [[1,18]] [[2,1800]] [[3,50], [7,900]]
+9 7000 9 [[1,19]] [[2,1900]] [[3,50], [7,1000]]
+9 10000 10 [[1,20]] [[2,2000]] [[3,50], [7,1100]]
100 10 0 [[501,1]] [[501,5]] [[501,10],[501,10]]
100 20 1 [[501,1]] [[501,5]] [[501,10],[501,10]]
100 30 2 [[501,1]] [[501,5]] [[501,10],[501,10]]
--
Gitblit v1.8.0