From 64c8c2fea90fbd70d1f1ba8e37f14cb87681e22f Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 29 四月 2026 16:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRecharge.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSpecialSale.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt | 6
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt | 10 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt | 40 ++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSignAward.txt | 14 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ADAward.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRechargeTemp.txt | 7 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ActTask.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRecharge.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRechargeTemp.txt | 10 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt | 11 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt | 11 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTask.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRechargeTemp.txt | 7 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt | 40 ++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRecharge.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt | 10 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSpecialSale.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ADAward.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRechargeTemp.txt | 10 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt | 6
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRecharge.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSignAward.txt | 14 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt | 1
33 files changed, 194 insertions(+), 34 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 1247175..8115d82 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/GM/Commands/ActTask.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ActTask.pyc
new file mode 100644
index 0000000..ae0148f
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ActTask.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.pyc
index 94a6af1..b54f3e7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTravel.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ADAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ADAward.txt
index b76e9f5..92d9b66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ADAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ADAward.txt
@@ -5,3 +5,4 @@
4 19 [] 1 0
5 2 [] 3 5
6 2 [] 4 15
+7 3 [[5,1],[20,1]] 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSignAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSignAward.txt
index 4c0dff6..3282b66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSignAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSignAward.txt
@@ -34,10 +34,10 @@
200 5 [[5,10]]
200 6 [[1,500]]
200 7 [[700,10]]
-51 1 [[3,200]]
-51 2 [[5,10]]
-51 3 [[1,500]]
-51 4 [[4,50]]
-51 5 [[5,10]]
-51 6 [[1,500]]
-51 7 [[700,10]]
+51 1 [[1,500],[12,100]]
+51 2 [[1,500],[4,25]]
+51 3 [[1,500],[8,200]]
+51 4 [[1,500],[3,500]]
+51 5 [[1,500],[31,20]]
+51 6 [[1,500],[20,10]]
+51 7 [[1,500],[1004,1]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSpecialSale.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSpecialSale.txt
index 14e77b4..0eda316 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSpecialSale.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActSpecialSale.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate CTGIDList ActShopType
-1 [] [] 10 K22 K25 [4000,4001,4002,4003] 0
-2 [] [] 30 2026-5-1 2026-5-7 [4000,4001,4002,4003] 25
+1 [] [] 10 K999 K999 [4000,4001,4002,4003] 0
+100 [] [] 30 2026-5-1 2026-5-7 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 25
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
index 9f3e7b0..fa1c9d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTask.txt
@@ -1,2 +1,2 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate IsDayReset TemplateID ActScoreItemID ActScoreMail ActScoreAwardInfo
-1 [] [] 30 2026-5-1 2026-5-7 0 51 601 ActTaskScore51 {"100":[0,1,10], "200":[1,1,10], "300":[2,1,10], "400":[3,1,10], "500":[4,1,10]}
+1 [] [] 30 2026-5-1 2026-5-7 0 51 36 ActTaskScore51 {"3000":[0,8,100],"6000":[0,3,300],"9000":[0,5,10],"15000":[0,20,20],"21000":[0,1005,1]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRecharge.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRecharge.txt
index 7bdb2cc..3e200c2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRecharge.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRecharge.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate CTGTypeEffValue TemplateID ActShopType AwardMail
1 [] [] 10 1 7 19 1 22 TotalRechargeDayOSA
-2 [] [] 30 2026-5-1 2026-5-7 19 1 22 TotalRechargeDayOSA
+2 [] [] 30 2026-5-1 2026-5-7 19 2 24 TotalRechargeDayHoliday
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRechargeTemp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRechargeTemp.txt
index 9fd9627..a519170 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRechargeTemp.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotDayRechargeTemp.txt
@@ -6,3 +6,10 @@
1 5 [[3,100],[5,20]]
1 6 [[3,100]]
1 7 [[3,800],[9,20]]
+2 1 [[3,100],[12,50]]
+2 2 [[3,100]]
+2 3 [[3,100],[8,200]]
+2 4 [[3,100]]
+2 5 [[3,100],[20,20]]
+2 6 [[3,100]]
+2 7 [[3,800],[9,20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRecharge.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRecharge.txt
index 352065b..9dc16dc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRecharge.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRecharge.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate IsDayReset CTGTypeEffValue IsOfflineAct CTGTempID CTGShopType AwardMail
1 [] [] 10 1 7 0 19 0 1 21 TotalRechargeOSA
-2 [] [] 30 2026-5-1 2026-5-7 0 19 0 1 21 TotalRechargeOSA
+2 [] [] 30 2026-5-1 2026-5-7 0 19 0 2 23 TotalRechargeHoliday
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRechargeTemp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRechargeTemp.txt
index c6856e5..7e664d9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRechargeTemp.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/ActTotalRechargeTemp.txt
@@ -7,3 +7,13 @@
1 648 5 [[5,50],[10,50]]
1 1000 6 [[1036,1]]
1 2000 7 [[1036,1],[9,50]]
+2 6 0 [[4,10],[4,10]]
+2 30 1 [[3,120],[3,120]]
+2 68 2 [[3,200],[3,200],[4504,1]]
+2 198 3 [[8,300],[8,300]]
+2 328 4 [[8,300],[8,300]]
+2 648 5 [[5,100],[10,100],[4800,1]]
+2 1000 6 [[1036,1],[20,100]]
+2 2000 7 [[1036,1],[9,100]]
+2 3000 8 [[1036,1],[1005,2],[3501,1]]
+2 5000 9 [[1036,1],[9,200],[20,400]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
index 0dd29e0..f90b08b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/CTG.txt
@@ -310,3 +310,13 @@
22008 0 1 0 0 0 1 3280 0 0 [] {} 0
22009 0 1 0 0 0 1 980 0 0 [] {} 0
22010 0 1 0 0 0 1 3280 0 0 [] {} 0
+23001 0 0 3 0 0 0 0 0 0 [[1,120],[3,120],[4,10]] {} 0
+23002 0 0 3 0 0 0 0 0 0 [[1,240],[3,180],[4,20]] {} 0
+23003 0 0 3 0 0 0 0 0 0 [[1,600],[8,320],[10,10]] {} 0
+23004 0 0 3 0 0 0 0 0 0 [[1,1360],[8,680],[10,20]] {} 0
+23005 0 0 3 0 0 0 0 0 0 [[1,3960],[8,1800],[10,50]] {} 0
+23006 0 0 3 0 0 0 0 0 0 [[1,600],[5,10],[20,10]] {} 0
+23007 0 0 3 0 0 0 0 0 0 [[1,1360],[5,20],[20,20]] {} 0
+23008 0 0 3 0 0 0 0 0 0 [[1,3960],[5,50],[20,50]] {} 0
+23009 0 0 3 0 0 0 0 0 0 [[1,6560],[5,80],[20,80]] {} 0
+23010 0 0 3 0 0 0 0 0 0 [[1,12960],[5,150],[20,150]] {} 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
index ac28fa0..3091eea 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
@@ -62,3 +62,4 @@
62 120 0 0 5 [[1, 20]]
63 100 0 0 0
64 100 0 0 0
+65 20 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt
index ccdedb6..24b67cf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroAwake.txt
@@ -313,7 +313,7 @@
510016 24 0 0 0 8 10
510017 1 35 200 0 0 0
510017 2 35 200 0 0 0
-510017 3 0 0 1014210 0 0
+510017 3 0 0 1017210 0 0
510017 4 36 200 0 0 0
510017 5 35 200 0 0 0
510017 6 0 0 0 5 10
@@ -325,13 +325,13 @@
510017 12 0 0 0 6 10
510017 13 36 200 0 0 0
510017 14 35 200 0 0 0
-510017 15 0 0 1014230 0 0
+510017 15 0 0 1017230 0 0
510017 16 35 200 0 0 0
510017 17 36 200 0 0 0
510017 18 0 0 0 7 10
510017 19 35 200 0 0 0
510017 20 35 200 0 0 0
-510017 21 0 0 1014240 0 0
+510017 21 0 0 1017240 0 0
510017 22 36 200 0 0 0
510017 23 35 200 0 0 0
510017 24 0 0 0 8 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
index a3785e8..3beb513 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
@@ -3,7 +3,7 @@
510001 2 23 1000 0
510001 3 59 1000 0
510001 4 45 4000 0
-510001 5 23|36 1000|500|500 0
+510001 5 23|36 1000|500 0
510001 6 0 0 1001070
510001 7 0 0 1001080
510001 8 0 0 1001090
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
index 2ea6e34..2f6581b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HorseSkin.txt
@@ -8,4 +8,4 @@
10 0 3 6 0
999 0 1 0
101 0 2 3500 1 1 5 [36] 100 100
-102 0 2 3500 1 1 5 [36] 100 100
+102 0 2 3501 1 1 5 [34] 200 100
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
index 1b266b1..dc9d224 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/OrderInfo.txt
@@ -310,6 +310,16 @@
cw.dcjjgj.4 xssg 328 22008 0 3280 328
cw.fcjj.1 xssg 98 22009 0 980 98
cw.fcjjgj.1 xssg 328 22010 0 3280 328
+cw.51lb.1 xssg 6 23001 0 980 6
+cw.51lb.2 xssg 12 23002 0 120 12
+cw.51lb.3 xssg 30 23003 0 980 30
+cw.51lb.4 xssg 68 23004 0 680 68
+cw.51lb.5 xssg 198 23005 0 980 198
+cw.51lb.6 xssg 30 23006 0 300 30
+cw.51lb.7 xssg 68 23007 0 980 68
+cw.51lb.8 xssg 198 23008 0 1980 198
+cw.51lb.9 xssg 98 23009 0 980 98
+cw.51lb.10 xssg 328 23010 0 3280 328
cw.sc.1 test 6 11 0 60 6
cw.sc.2 test 18 12 0 180 18
cw.sc.3 test 30 13 0 300 30
@@ -621,6 +631,16 @@
cw.dcjjgj.4 test 328 22008 0 3280 328
cw.fcjj.1 test 98 22009 0 980 98
cw.fcjjgj.1 test 328 22010 0 3280 328
+cw.51lb.1 test 6 23001 0 980 6
+cw.51lb.2 test 12 23002 0 120 12
+cw.51lb.3 test 30 23003 0 980 30
+cw.51lb.4 test 68 23004 0 680 68
+cw.51lb.5 test 198 23005 0 980 198
+cw.51lb.6 test 30 23006 0 300 30
+cw.51lb.7 test 68 23007 0 980 68
+cw.51lb.8 test 198 23008 0 1980 198
+cw.51lb.9 test 98 23009 0 980 98
+cw.51lb.10 test 328 23010 0 3280 328
cw.sc.1 ryzj 6 11 0 60 6
cw.sc.2 ryzj 18 12 0 180 18
cw.sc.3 ryzj 30 13 0 300 30
@@ -932,6 +952,16 @@
cw.dcjjgj.4 ryzj 328 22008 0 3280 328
cw.fcjj.1 ryzj 98 22009 0 980 98
cw.fcjjgj.1 ryzj 328 22010 0 3280 328
+cw.51lb.1 ryzj 6 23001 0 980 6
+cw.51lb.2 ryzj 12 23002 0 120 12
+cw.51lb.3 ryzj 30 23003 0 980 30
+cw.51lb.4 ryzj 68 23004 0 680 68
+cw.51lb.5 ryzj 198 23005 0 980 198
+cw.51lb.6 ryzj 30 23006 0 300 30
+cw.51lb.7 ryzj 68 23007 0 980 68
+cw.51lb.8 ryzj 198 23008 0 1980 198
+cw.51lb.9 ryzj 98 23009 0 980 98
+cw.51lb.10 ryzj 328 23010 0 3280 328
cw.sc.1 sghy 6 11 0 60 6
cw.sc.2 sghy 18 12 0 180 18
cw.sc.3 sghy 30 13 0 300 30
@@ -1243,3 +1273,13 @@
cw.dcjjgj.4 sghy 328 22008 0 3280 328
cw.fcjj.1 sghy 98 22009 0 980 98
cw.fcjjgj.1 sghy 328 22010 0 3280 328
+cw.51lb.1 sghy 6 23001 0 980 6
+cw.51lb.2 sghy 12 23002 0 120 12
+cw.51lb.3 sghy 30 23003 0 980 30
+cw.51lb.4 sghy 68 23004 0 680 68
+cw.51lb.5 sghy 198 23005 0 980 198
+cw.51lb.6 sghy 30 23006 0 300 30
+cw.51lb.7 sghy 68 23007 0 980 68
+cw.51lb.8 sghy 198 23008 0 1980 198
+cw.51lb.9 sghy 98 23009 0 980 98
+cw.51lb.10 sghy 328 23010 0 3280 328
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 cc0a719..5cde9a3 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
@@ -127,3 +127,14 @@
5007 501 9 10 [] 0 20 701 0 1000 0 0 0
6000 21 3 10 [] 1 1 0 1 0 0 0 0
6001 22 3 10 [] 1 1 0 1 0 0 0 0
+7000 23 3 10 [] 1 1 0 1 0 0 0 0
+7001 24 3 10 [] 1 1 0 1 0 0 0 0
+7002 25 3 20 [] 1 1 0 0 0 0 0 0
+7003 25 0 0 [[5,1],[20,1]] 0 10 0 1 280 480 0 0
+7010 26 9 1 [] 0 20 36 0 800 0 0 0
+7007 26 10 1 [] 1 40 36 0 150 0 0 0
+7004 26 8 10 [] 0 20 36 0 180 0 0 0
+7005 26 13 2 [] 0 10 36 0 300 0 0 0
+7006 26 20 1 [] 0 20 36 0 100 0 0 0
+7008 26 5 1 [] 0 19 36 0 100 0 0 0
+7009 26 3 10 [] 0 50 36 0 40 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ADAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ADAward.txt
index b76e9f5..92d9b66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ADAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ADAward.txt
@@ -5,3 +5,4 @@
4 19 [] 1 0
5 2 [] 3 5
6 2 [] 4 15
+7 3 [[5,1],[20,1]] 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSignAward.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSignAward.txt
index 4c0dff6..3282b66 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSignAward.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSignAward.txt
@@ -34,10 +34,10 @@
200 5 [[5,10]]
200 6 [[1,500]]
200 7 [[700,10]]
-51 1 [[3,200]]
-51 2 [[5,10]]
-51 3 [[1,500]]
-51 4 [[4,50]]
-51 5 [[5,10]]
-51 6 [[1,500]]
-51 7 [[700,10]]
+51 1 [[1,500],[12,100]]
+51 2 [[1,500],[4,25]]
+51 3 [[1,500],[8,200]]
+51 4 [[1,500],[3,500]]
+51 5 [[1,500],[31,20]]
+51 6 [[1,500],[20,10]]
+51 7 [[1,500],[1004,1]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSpecialSale.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSpecialSale.txt
index 14e77b4..0eda316 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSpecialSale.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActSpecialSale.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate CTGIDList ActShopType
-1 [] [] 10 K22 K25 [4000,4001,4002,4003] 0
-2 [] [] 30 2026-5-1 2026-5-7 [4000,4001,4002,4003] 25
+1 [] [] 10 K999 K999 [4000,4001,4002,4003] 0
+100 [] [] 30 2026-5-1 2026-5-7 [23001,23002,23003,23004,23005,23006,23007,23008,23009,23010] 25
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTask.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTask.txt
index 9f3e7b0..fa1c9d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTask.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTask.txt
@@ -1,2 +1,2 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate IsDayReset TemplateID ActScoreItemID ActScoreMail ActScoreAwardInfo
-1 [] [] 30 2026-5-1 2026-5-7 0 51 601 ActTaskScore51 {"100":[0,1,10], "200":[1,1,10], "300":[2,1,10], "400":[3,1,10], "500":[4,1,10]}
+1 [] [] 30 2026-5-1 2026-5-7 0 51 36 ActTaskScore51 {"3000":[0,8,100],"6000":[0,3,300],"9000":[0,5,10],"15000":[0,20,20],"21000":[0,1005,1]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRecharge.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRecharge.txt
index 7bdb2cc..3e200c2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRecharge.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRecharge.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate CTGTypeEffValue TemplateID ActShopType AwardMail
1 [] [] 10 1 7 19 1 22 TotalRechargeDayOSA
-2 [] [] 30 2026-5-1 2026-5-7 19 1 22 TotalRechargeDayOSA
+2 [] [] 30 2026-5-1 2026-5-7 19 2 24 TotalRechargeDayHoliday
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRechargeTemp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRechargeTemp.txt
index 9fd9627..a519170 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRechargeTemp.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotDayRechargeTemp.txt
@@ -6,3 +6,10 @@
1 5 [[3,100],[5,20]]
1 6 [[3,100]]
1 7 [[3,800],[9,20]]
+2 1 [[3,100],[12,50]]
+2 2 [[3,100]]
+2 3 [[3,100],[8,200]]
+2 4 [[3,100]]
+2 5 [[3,100],[20,20]]
+2 6 [[3,100]]
+2 7 [[3,800],[9,20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRecharge.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRecharge.txt
index 352065b..9dc16dc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRecharge.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRecharge.txt
@@ -1,3 +1,3 @@
CfgID PlatformList ServerIDList ActNum StartDate EndDate IsDayReset CTGTypeEffValue IsOfflineAct CTGTempID CTGShopType AwardMail
1 [] [] 10 1 7 0 19 0 1 21 TotalRechargeOSA
-2 [] [] 30 2026-5-1 2026-5-7 0 19 0 1 21 TotalRechargeOSA
+2 [] [] 30 2026-5-1 2026-5-7 0 19 0 2 23 TotalRechargeHoliday
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRechargeTemp.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRechargeTemp.txt
index c6856e5..7e664d9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRechargeTemp.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/ActTotalRechargeTemp.txt
@@ -7,3 +7,13 @@
1 648 5 [[5,50],[10,50]]
1 1000 6 [[1036,1]]
1 2000 7 [[1036,1],[9,50]]
+2 6 0 [[4,10],[4,10]]
+2 30 1 [[3,120],[3,120]]
+2 68 2 [[3,200],[3,200],[4504,1]]
+2 198 3 [[8,300],[8,300]]
+2 328 4 [[8,300],[8,300]]
+2 648 5 [[5,100],[10,100],[4800,1]]
+2 1000 6 [[1036,1],[20,100]]
+2 2000 7 [[1036,1],[9,100]]
+2 3000 8 [[1036,1],[1005,2],[3501,1]]
+2 5000 9 [[1036,1],[9,200],[20,400]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
index 0dd29e0..f90b08b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/CTG.txt
@@ -310,3 +310,13 @@
22008 0 1 0 0 0 1 3280 0 0 [] {} 0
22009 0 1 0 0 0 1 980 0 0 [] {} 0
22010 0 1 0 0 0 1 3280 0 0 [] {} 0
+23001 0 0 3 0 0 0 0 0 0 [[1,120],[3,120],[4,10]] {} 0
+23002 0 0 3 0 0 0 0 0 0 [[1,240],[3,180],[4,20]] {} 0
+23003 0 0 3 0 0 0 0 0 0 [[1,600],[8,320],[10,10]] {} 0
+23004 0 0 3 0 0 0 0 0 0 [[1,1360],[8,680],[10,20]] {} 0
+23005 0 0 3 0 0 0 0 0 0 [[1,3960],[8,1800],[10,50]] {} 0
+23006 0 0 3 0 0 0 0 0 0 [[1,600],[5,10],[20,10]] {} 0
+23007 0 0 3 0 0 0 0 0 0 [[1,1360],[5,20],[20,20]] {} 0
+23008 0 0 3 0 0 0 0 0 0 [[1,3960],[5,50],[20,50]] {} 0
+23009 0 0 3 0 0 0 0 0 0 [[1,6560],[5,80],[20,80]] {} 0
+23010 0 0 3 0 0 0 0 0 0 [[1,12960],[5,150],[20,150]] {} 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
index ac28fa0..3091eea 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
@@ -62,3 +62,4 @@
62 120 0 0 5 [[1, 20]]
63 100 0 0 0
64 100 0 0 0
+65 20 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt
index ccdedb6..24b67cf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroAwake.txt
@@ -313,7 +313,7 @@
510016 24 0 0 0 8 10
510017 1 35 200 0 0 0
510017 2 35 200 0 0 0
-510017 3 0 0 1014210 0 0
+510017 3 0 0 1017210 0 0
510017 4 36 200 0 0 0
510017 5 35 200 0 0 0
510017 6 0 0 0 5 10
@@ -325,13 +325,13 @@
510017 12 0 0 0 6 10
510017 13 36 200 0 0 0
510017 14 35 200 0 0 0
-510017 15 0 0 1014230 0 0
+510017 15 0 0 1017230 0 0
510017 16 35 200 0 0 0
510017 17 36 200 0 0 0
510017 18 0 0 0 7 10
510017 19 35 200 0 0 0
510017 20 35 200 0 0 0
-510017 21 0 0 1014240 0 0
+510017 21 0 0 1017240 0 0
510017 22 36 200 0 0 0
510017 23 35 200 0 0 0
510017 24 0 0 0 8 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
index a3785e8..3beb513 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
@@ -3,7 +3,7 @@
510001 2 23 1000 0
510001 3 59 1000 0
510001 4 45 4000 0
-510001 5 23|36 1000|500|500 0
+510001 5 23|36 1000|500 0
510001 6 0 0 1001070
510001 7 0 0 1001080
510001 8 0 0 1001090
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
index 2ea6e34..2f6581b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HorseSkin.txt
@@ -8,4 +8,4 @@
10 0 3 6 0
999 0 1 0
101 0 2 3500 1 1 5 [36] 100 100
-102 0 2 3500 1 1 5 [36] 100 100
+102 0 2 3501 1 1 5 [34] 200 100
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
index 1b266b1..dc9d224 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/OrderInfo.txt
@@ -310,6 +310,16 @@
cw.dcjjgj.4 xssg 328 22008 0 3280 328
cw.fcjj.1 xssg 98 22009 0 980 98
cw.fcjjgj.1 xssg 328 22010 0 3280 328
+cw.51lb.1 xssg 6 23001 0 980 6
+cw.51lb.2 xssg 12 23002 0 120 12
+cw.51lb.3 xssg 30 23003 0 980 30
+cw.51lb.4 xssg 68 23004 0 680 68
+cw.51lb.5 xssg 198 23005 0 980 198
+cw.51lb.6 xssg 30 23006 0 300 30
+cw.51lb.7 xssg 68 23007 0 980 68
+cw.51lb.8 xssg 198 23008 0 1980 198
+cw.51lb.9 xssg 98 23009 0 980 98
+cw.51lb.10 xssg 328 23010 0 3280 328
cw.sc.1 test 6 11 0 60 6
cw.sc.2 test 18 12 0 180 18
cw.sc.3 test 30 13 0 300 30
@@ -621,6 +631,16 @@
cw.dcjjgj.4 test 328 22008 0 3280 328
cw.fcjj.1 test 98 22009 0 980 98
cw.fcjjgj.1 test 328 22010 0 3280 328
+cw.51lb.1 test 6 23001 0 980 6
+cw.51lb.2 test 12 23002 0 120 12
+cw.51lb.3 test 30 23003 0 980 30
+cw.51lb.4 test 68 23004 0 680 68
+cw.51lb.5 test 198 23005 0 980 198
+cw.51lb.6 test 30 23006 0 300 30
+cw.51lb.7 test 68 23007 0 980 68
+cw.51lb.8 test 198 23008 0 1980 198
+cw.51lb.9 test 98 23009 0 980 98
+cw.51lb.10 test 328 23010 0 3280 328
cw.sc.1 ryzj 6 11 0 60 6
cw.sc.2 ryzj 18 12 0 180 18
cw.sc.3 ryzj 30 13 0 300 30
@@ -932,6 +952,16 @@
cw.dcjjgj.4 ryzj 328 22008 0 3280 328
cw.fcjj.1 ryzj 98 22009 0 980 98
cw.fcjjgj.1 ryzj 328 22010 0 3280 328
+cw.51lb.1 ryzj 6 23001 0 980 6
+cw.51lb.2 ryzj 12 23002 0 120 12
+cw.51lb.3 ryzj 30 23003 0 980 30
+cw.51lb.4 ryzj 68 23004 0 680 68
+cw.51lb.5 ryzj 198 23005 0 980 198
+cw.51lb.6 ryzj 30 23006 0 300 30
+cw.51lb.7 ryzj 68 23007 0 980 68
+cw.51lb.8 ryzj 198 23008 0 1980 198
+cw.51lb.9 ryzj 98 23009 0 980 98
+cw.51lb.10 ryzj 328 23010 0 3280 328
cw.sc.1 sghy 6 11 0 60 6
cw.sc.2 sghy 18 12 0 180 18
cw.sc.3 sghy 30 13 0 300 30
@@ -1243,3 +1273,13 @@
cw.dcjjgj.4 sghy 328 22008 0 3280 328
cw.fcjj.1 sghy 98 22009 0 980 98
cw.fcjjgj.1 sghy 328 22010 0 3280 328
+cw.51lb.1 sghy 6 23001 0 980 6
+cw.51lb.2 sghy 12 23002 0 120 12
+cw.51lb.3 sghy 30 23003 0 980 30
+cw.51lb.4 sghy 68 23004 0 680 68
+cw.51lb.5 sghy 198 23005 0 980 198
+cw.51lb.6 sghy 30 23006 0 300 30
+cw.51lb.7 sghy 68 23007 0 980 68
+cw.51lb.8 sghy 198 23008 0 1980 198
+cw.51lb.9 sghy 98 23009 0 980 98
+cw.51lb.10 sghy 328 23010 0 3280 328
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 cc0a719..5cde9a3 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
@@ -127,3 +127,14 @@
5007 501 9 10 [] 0 20 701 0 1000 0 0 0
6000 21 3 10 [] 1 1 0 1 0 0 0 0
6001 22 3 10 [] 1 1 0 1 0 0 0 0
+7000 23 3 10 [] 1 1 0 1 0 0 0 0
+7001 24 3 10 [] 1 1 0 1 0 0 0 0
+7002 25 3 20 [] 1 1 0 0 0 0 0 0
+7003 25 0 0 [[5,1],[20,1]] 0 10 0 1 280 480 0 0
+7010 26 9 1 [] 0 20 36 0 800 0 0 0
+7007 26 10 1 [] 1 40 36 0 150 0 0 0
+7004 26 8 10 [] 0 20 36 0 180 0 0 0
+7005 26 13 2 [] 0 10 36 0 300 0 0 0
+7006 26 20 1 [] 0 20 36 0 100 0 0 0
+7008 26 5 1 [] 0 19 36 0 100 0 0 0
+7009 26 3 10 [] 0 50 36 0 40 0 0 0
--
Gitblit v1.8.0