From c1e2ff6b72e33b59c38cc3a1a0181dbb64cf82d9 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 16 十二月 2025 20:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6027.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 33 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 33 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt | 14 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5504.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5500.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Success.txt | 10 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6026.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt | 14 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Success.txt | 10 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt | 28 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Store.txt | 28 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt | 2
22 files changed, 88 insertions(+), 90 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index 0e53413..3a6c057 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 9ac40b4..4c55569 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/Skill/PassiveTrigger/PassiveEff_5012.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc
index 266c9ff..daf3b46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5012.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5050.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5500.pyc
similarity index 84%
rename from ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5050.pyc
rename to ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5500.pyc
index c09b948..9a90c03 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5050.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5500.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5504.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5504.pyc
index d4fed24..dd49b3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5504.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5504.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.pyc
new file mode 100644
index 0000000..d33ed68
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5505.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6026.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6026.pyc
new file mode 100644
index 0000000..fd6b65d
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6026.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6027.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6027.pyc
new file mode 100644
index 0000000..2829809
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6027.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
index 5c937ff..7ffd2d5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 3635230..574ec28 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
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 284b5f5..91b5879 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
@@ -384,7 +384,7 @@
PersonalMail 200
BillboardSet [] {0:1000, 1:9999, 2:9999, 3:9999, 4:9999} {}
OSABillboard {"3":[1, 2], "4":[2, 3]} {"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]]}
-OSACelebration 7 {"2000":[[3,100]],"3000":[[7,10000]],"5000":[[2,20000]],"8000":[[8,100]],"10000":[[5,10]]} 20
+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, 3:30}
PlayerViewCache 50 7
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 596771a..28e36fb 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
@@ -6,7 +6,7 @@
5 335 0 0 30
6 70 0 0 7
7 96 0 0 2 [[1, 20]]
-8 0 0 1540 [[1, 20]]
+8 0 0 2310 [[1, 20]]
9 0 0 1590 [[1, 20]]
10 1 0 0
11 0 0 1760 [[1, 20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index ae2a356..db6f453 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -26,7 +26,7 @@
1017 1017 1 1 净化 0 15 0 0 5 0 0 0 0 10000 0 0 10000 5011 1 1 5005 [4,6,14]|0 13 0 2 2 0 0 0 0 0 0 0
1018 1018 1 1 复苏 0 2 0 2 5 0 0 0 1 3000 0 0 10000 5011 0|[0,30] 24 1 7009 1 0 0 0 0 0 0 0 0 0
1019 1019 1 1 枯萎 0 6 0 0 0 0 0 0 0 10000 0 0 10000 51 4000|2 5011 1 1 0 0 0 0 0 0 1 0 0
-1020 1020 1 1 反制 0 1 0 1 0 0 0 0 0 10000 0 0 10000 5050 0|5 11 1 0 0 0 0 0 0 0 0 0 0
+1020 1020 1 1 反制 0 1 0 1 0 0 0 0 0 10000 0 0 10000 5500 0|5 11 1 0 0 0 0 0 0 0 0 0 0
1021 1021 1 1 秘药 0 2 0 2 5 0 0 0 0 2500 0 0 10000 5011 25 1 0 0 0 0 0 0 0 0 0 0
1022 1022 1 1 免控 0 0 0 0 0 0 0 0 0 10000 0 0 10000 6008 101|1 8 1 0 0 0 0 0 0 0 0 0 0
1023 1023 1 1 磐石 0 0 0 0 5 0 0 0 0 10000 0 0 10000 32 5000|1 1 0 0 0 0 0 0 0 0 0 0
@@ -361,13 +361,12 @@
20140101 20140101 1 1 青龙偃月 0 1 1 1 6 0 0 0 5 1000 0 50000 10000 0 0 0 2 0 0 0 0 0 0
2014020 2014020 1 1 飞龙在天 2 1 1 1 0 0 1 1 0 41000 0 0 10000 6009 50 8 3 0 0 0 4|1 0 0 0 0 0 0 0 60000
2014030 2014030 1 1 拖刀 3 0 0 0 0 0 0 0 0 0 10000 5012 10000|2014020 26 1 1 4|1 240000
-2014050 2014050 1 1 武圣 3 0 480000
-2014070 2014070 1 1 忠义 3 0 720000
-2014080 2014080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 840000
-2014090 2014090 1 1 升变 3 0 0
-2014210 2014210 1 1 飞龙在天·极 120000
-2014230 2014230 1 1 飞龙在天·狂 360000
-2014240 2014240 1 1 神格 480000
+2014050 2014050 1 1 武圣 3 5 5 0 10000 45 1000|1 5011 7 1 1 10 3 480000
+2014070 2014070 1 1 忠义 3 2 2 5 1 2500 0 10000 5011 15 1 720000
+2014080 2014080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 840000
+2014210 2014210 1 1 飞龙在天·极 6006 3000 8 2014010 120000
+2014230 2014230 1 1 飞龙在天·狂 6006 19000 8 2014020 360000
+2014240 2014240 1 1 神格 5022 [16,300,1]| 23 2014050 480000
2015010 2015010 1 1 丈八蛇矛 1 1 1 1 1 0 0 1 0 9000 0 0 10000 5012 5000|20150101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
20150101 20150101 1 1 烈酒 0 2 0 2 5 0 0 1 1 1500 0 0 10000 0 0 0 0 0 0 0 0 0 42
2015020 2015020 1 1 当阳啸 2 1 1 1 2 0 0 3 0 14000 0 0 10000 5010 20150201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
@@ -488,14 +487,14 @@
3009010 3009010 1 1 霸王枪 1 1 1 1 0 0 1 1 0 11000 0 0 10000 0 0 0 0 3|1 0 0 0 0 0 0 0 5000
3009020 3009020 1 1 江东绝绁 2 1 1 1 0 0 1 1 0 35000 0 0 10000 5011 30090201 15 3 0 0 0 4|1 0 0 0 0 0 0 0 50000
30090201 30090201 1 1 灼烧 0 4 1 1001 0 0 1 1 0 5000 0 0 10000 5001 4 2 0 0 0 4 3 3 0 4 0 0 0
-3009030 3009030 1 1 镇敌 3 0 200000
-3009050 3009050 1 1 射鼋 3 0 400000
-3009070 3009070 1 1 讨逆 3 0 600000
-3009080 3009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 700000
-3009090 3009090 1 1 升变 3 0 0
-3009210 3009210 1 1 江东绝绁·极 100000
-3009230 3009230 1 1 江东绝绁·狂 300000
-3009240 3009240 1 1 神格 400000
+3009030 3009030 1 1 镇敌 3 11 11 1 6 1 3 1000 50000 5505 0|[0,10] 10 1 200000
+3009050 3009050 1 1 射鼋 3 6 6 0 5000 5504 0|[4,23]|0 10 1 17 1 400000
+3009070 3009070 1 1 讨逆 3 4 1 1001 6 5000 0 10000 5001 4 2 5504 0|[17]|0 10 1 4 3 3 4 600000
+3009080 3009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 700000
+3009090 3009090 1 1 升变 3 0 6026 [4,23]|2|1 8 3009030 6027 50000 8 3009030 800000
+3009210 3009210 1 1 江东绝绁·极 6006 10000 8 3009020 100000
+3009230 3009230 1 1 江东绝绁·狂 6006 5000 8 30090201 6006 5000 8 3009070 300000
+3009240 3009240 1 1 神格 6026 []|5|1 8 3009030 400000
3010010 3010010 1 1 掠炎 1 1 1 1 1 0 0 1 0 12000 0 0 10000 23 5000|1|[4,23] 8 3 0 0 0 3|1 0 0 0 0 0 0 0 5000
3010020 3010020 1 1 枭姬箭羽 2 1 1 1 0 0 6 1 0 43000 0 0 10000 5008 [3,5]|1|30100201 13 0 0 0 4|1 0 0 0 0 0 0 0 50000
30100201 30100201 1 1 灼烧 0 4 1 1001 6 0 0 1 0 5000 0 0 10000 5001 4 2 0 0 0 4 3 1 0 4 0 0 0
@@ -675,7 +674,7 @@
40090201 40090201 1 1 链接 3 10 6 0 10000 29 2 2 0
4009030 4009030 1 1 狂歌 3 5 5 0 10000 16 1000|1 5011 40 1 34 2 5 3 1 2 200000
4009050 4009050 1 1 烛世 3 5 1 6 0 10000 35 2500|1 5024 34|[35,500,1]|500 23 3 5011 43 1 400000
-4009070 4009070 1 1 天罗 3 2 2 5 1 2500 0 10000 5504 0|29|1 26 1 5501 4009030|2 13 600000
+4009070 4009070 1 1 天罗 3 2 2 5 1 2500 0 10000 5504 0|[29]|1 26 1 5501 4009030|2 13 600000
4009080 4009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 700000
4009090 4009090 1 1 升变 3 0 35 100|11 8 1 800000
4009210 4009210 1 1 同命锁·极 4 5022 [17,5000,2]| 23 40090201 100000
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 eb5b030..f1e7250 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
@@ -23,18 +23,18 @@
107 2 2 20000 [] 1 2 15 1080 0 0
108 2 5 10 [] 2 10 15 3000 0 0
109 2 20 10 [] 2 100 15 5000 0 0
-200 3 11014 1 [] 0 1 43 1000 0 2 1000
-201 3 12013 1 [] 0 1 43 1000 0 2 1000
-202 3 13012 1 [] 0 1 43 1000 0 2 1000
-203 3 14013 1 [] 0 1 43 1000 0 2 1000
-204 3 11009 1 [] 0 1 43 800 0 2 1000
-205 3 12008 1 [] 0 1 43 800 0 2 1000
-206 3 13010 1 [] 0 1 43 800 0 2 1000
-207 3 14009 1 [] 0 1 43 800 0 2 1000
-208 3 11007 1 [] 0 1 43 250 0 2 1000
-209 3 12005 1 [] 0 1 43 250 0 2 1000
-210 3 13004 1 [] 0 1 43 250 0 2 1000
-211 3 14006 1 [] 0 1 43 250 0 2 1000
+200 3 11014 1 [] 0 1 43 640 0 2 1000
+201 3 12013 1 [] 0 1 43 640 0 2 1000
+202 3 13012 1 [] 0 1 43 640 0 2 1000
+203 3 14013 1 [] 0 1 43 640 0 2 1000
+204 3 11009 1 [] 0 1 43 160 0 2 1000
+205 3 12008 1 [] 0 1 43 160 0 2 1000
+206 3 13010 1 [] 0 1 43 160 0 2 1000
+207 3 14009 1 [] 0 1 43 160 0 2 1000
+208 3 11007 1 [] 0 1 43 40 0 2 1000
+209 3 12005 1 [] 0 1 43 40 0 2 1000
+210 3 13004 1 [] 0 1 43 40 0 2 1000
+211 3 14006 1 [] 0 1 43 40 0 2 1000
300 5 3 5 [] 0 50 55 20 0 0 0
301 5 12 2 [] 0 20 55 30 0 0 0
302 5 2 500 [] 0 40 55 40 0 0 0
@@ -42,8 +42,8 @@
304 5 8 20 [] 0 5 55 200 0 0 0
305 5 6 3 [] 0 5 55 300 0 0 0
306 5 13 4 [] 0 4 55 400 0 0 0
-307 5 5 5 [] 0 5 55 1000 0 0 0
-308 5 11009 1 [] 0 50 55 100 0 0 0
+307 5 5 5 [] 0 5 55 500 0 0 0
+308 5 11009 1 [] 0 50 55 75 0 0 0
10001 4 3 10 [] 1 1 1 0 50 0 0
10002 4 5 7 [] 1 1 1 1588 1960 0 0
10010 6 1 10 [[3,20]] 1 1 1 0 110 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Success.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Success.txt
index 6b4c95f..96c5e9b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Success.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Success.txt
@@ -9,15 +9,15 @@
8 1 810 [[1,200],[8,100],[5,10]]
9 1 910 [[1,200],[8,100],[14011,25]]
10 1 1010 [[1,200],[8,100],[5,10]]
-11 1 1110 [[1,200],[8,200],[5,10]]
+11 1 1110 [[1,200],[8,200],[5,10],[14013,10]]
12 1 1210 [[1,200],[8,200],[5,10]]
-13 1 1310 [[1,200],[8,200],[5,10]]
+13 1 1310 [[1,200],[8,200],[5,10],[14013,10]]
14 1 1410 [[1,200],[8,200],[5,10]]
-15 1 1510 [[1,200],[8,200],[5,10]]
+15 1 1510 [[1,200],[8,200],[5,10],[14013,10]]
16 1 1610 [[1,200],[8,200],[5,10]]
-17 1 1710 [[1,200],[8,200],[5,10]]
+17 1 1710 [[1,200],[8,200],[5,10],[14013,10]]
18 1 1810 [[1,200],[8,200],[5,10]]
-19 1 1910 [[1,200],[8,200],[5,10]]
+19 1 1910 [[1,200],[8,200],[5,10],[14013,10]]
20 1 2010 [[1,200],[8,200],[5,10]]
21 1 2310 [[1,200],[8,500],[5,20]]
22 1 2610 [[1,200],[8,500],[5,20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
index fff674c..9931ef3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
@@ -50,11 +50,11 @@
1490 0 1 [205] 1 [[7,2000,0]]
1500 0 4 [41] 10 [[3,5,0]]
1510 0 15 [] 1 [[3,5,0]]
-1520 0 3 [] 10 [[3,5,0]]
+1520 0 4 [41] 10 [[3,5,0]]
1530 0 3 [] 10 [[3,5,0]]
-1540 0 1 [301] 1 [[3,5,0]]
-1550 0 16 [] 1 [[1,200,0]]
-1560 0 17 [] 2 [[3,5,0]]
+1540 0 1 [301] 1 [[1,50,0]]
+1550 0 4 [41] 10 [[3,5,0]]
+1560 0 3 [] 10 [[3,5,0]]
1570 0 14 [] 1 [[3,5,0]]
1580 0 3 [] 10 [[3,5,0]]
1590 0 1 [302] 1 [[3,5,0]]
@@ -75,7 +75,7 @@
1740 0 4 [41] 10 [[3,5,0]]
1750 0 3 [] 10 [[3,5,0]]
1760 0 1 [305] 1 [[3,5,0]]
-1770 0 18 [] 1 [[3,5,0]]
+1770 0 18 [] 1 [[1,100,0]]
1780 0 5 [] 23 [[7,3000,0]]
1790 0 8 [42] 500 [[3,5,0]]
1800 0 4 [41] 10 [[3,5,0]]
@@ -130,8 +130,8 @@
2290 0 3 [] 10 [[3,10,0]]
2300 0 8 [42] 500 [[3,10,0]]
2310 0 1 [407] 1 [[3,10,0]]
-2320 0 4 [41] 10 [[3,10,0]]
-2330 0 7 [] 5 [[3,10,0]]
+2320 0 16 [] 1 [[1,200,0]]
+2330 0 17 [] 2 [[3,10,0]]
2340 0 3 [] 10 [[3,10,0]]
2350 0 8 [42] 500 [[3,10,0]]
2360 0 1 [408] 1 [[3,10,0]]
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 284b5f5..91b5879 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
@@ -384,7 +384,7 @@
PersonalMail 200
BillboardSet [] {0:1000, 1:9999, 2:9999, 3:9999, 4:9999} {}
OSABillboard {"3":[1, 2], "4":[2, 3]} {"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]]}
-OSACelebration 7 {"2000":[[3,100]],"3000":[[7,10000]],"5000":[[2,20000]],"8000":[[8,100]],"10000":[[5,10]]} 20
+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, 3:30}
PlayerViewCache 50 7
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 596771a..28e36fb 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
@@ -6,7 +6,7 @@
5 335 0 0 30
6 70 0 0 7
7 96 0 0 2 [[1, 20]]
-8 0 0 1540 [[1, 20]]
+8 0 0 2310 [[1, 20]]
9 0 0 1590 [[1, 20]]
10 1 0 0
11 0 0 1760 [[1, 20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index ae2a356..db6f453 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -26,7 +26,7 @@
1017 1017 1 1 净化 0 15 0 0 5 0 0 0 0 10000 0 0 10000 5011 1 1 5005 [4,6,14]|0 13 0 2 2 0 0 0 0 0 0 0
1018 1018 1 1 复苏 0 2 0 2 5 0 0 0 1 3000 0 0 10000 5011 0|[0,30] 24 1 7009 1 0 0 0 0 0 0 0 0 0
1019 1019 1 1 枯萎 0 6 0 0 0 0 0 0 0 10000 0 0 10000 51 4000|2 5011 1 1 0 0 0 0 0 0 1 0 0
-1020 1020 1 1 反制 0 1 0 1 0 0 0 0 0 10000 0 0 10000 5050 0|5 11 1 0 0 0 0 0 0 0 0 0 0
+1020 1020 1 1 反制 0 1 0 1 0 0 0 0 0 10000 0 0 10000 5500 0|5 11 1 0 0 0 0 0 0 0 0 0 0
1021 1021 1 1 秘药 0 2 0 2 5 0 0 0 0 2500 0 0 10000 5011 25 1 0 0 0 0 0 0 0 0 0 0
1022 1022 1 1 免控 0 0 0 0 0 0 0 0 0 10000 0 0 10000 6008 101|1 8 1 0 0 0 0 0 0 0 0 0 0
1023 1023 1 1 磐石 0 0 0 0 5 0 0 0 0 10000 0 0 10000 32 5000|1 1 0 0 0 0 0 0 0 0 0 0
@@ -361,13 +361,12 @@
20140101 20140101 1 1 青龙偃月 0 1 1 1 6 0 0 0 5 1000 0 50000 10000 0 0 0 2 0 0 0 0 0 0
2014020 2014020 1 1 飞龙在天 2 1 1 1 0 0 1 1 0 41000 0 0 10000 6009 50 8 3 0 0 0 4|1 0 0 0 0 0 0 0 60000
2014030 2014030 1 1 拖刀 3 0 0 0 0 0 0 0 0 0 10000 5012 10000|2014020 26 1 1 4|1 240000
-2014050 2014050 1 1 武圣 3 0 480000
-2014070 2014070 1 1 忠义 3 0 720000
-2014080 2014080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 840000
-2014090 2014090 1 1 升变 3 0 0
-2014210 2014210 1 1 飞龙在天·极 120000
-2014230 2014230 1 1 飞龙在天·狂 360000
-2014240 2014240 1 1 神格 480000
+2014050 2014050 1 1 武圣 3 5 5 0 10000 45 1000|1 5011 7 1 1 10 3 480000
+2014070 2014070 1 1 忠义 3 2 2 5 1 2500 0 10000 5011 15 1 720000
+2014080 2014080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 840000
+2014210 2014210 1 1 飞龙在天·极 6006 3000 8 2014010 120000
+2014230 2014230 1 1 飞龙在天·狂 6006 19000 8 2014020 360000
+2014240 2014240 1 1 神格 5022 [16,300,1]| 23 2014050 480000
2015010 2015010 1 1 丈八蛇矛 1 1 1 1 1 0 0 1 0 9000 0 0 10000 5012 5000|20150101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
20150101 20150101 1 1 烈酒 0 2 0 2 5 0 0 1 1 1500 0 0 10000 0 0 0 0 0 0 0 0 0 42
2015020 2015020 1 1 当阳啸 2 1 1 1 2 0 0 3 0 14000 0 0 10000 5010 20150201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
@@ -488,14 +487,14 @@
3009010 3009010 1 1 霸王枪 1 1 1 1 0 0 1 1 0 11000 0 0 10000 0 0 0 0 3|1 0 0 0 0 0 0 0 5000
3009020 3009020 1 1 江东绝绁 2 1 1 1 0 0 1 1 0 35000 0 0 10000 5011 30090201 15 3 0 0 0 4|1 0 0 0 0 0 0 0 50000
30090201 30090201 1 1 灼烧 0 4 1 1001 0 0 1 1 0 5000 0 0 10000 5001 4 2 0 0 0 4 3 3 0 4 0 0 0
-3009030 3009030 1 1 镇敌 3 0 200000
-3009050 3009050 1 1 射鼋 3 0 400000
-3009070 3009070 1 1 讨逆 3 0 600000
-3009080 3009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 700000
-3009090 3009090 1 1 升变 3 0 0
-3009210 3009210 1 1 江东绝绁·极 100000
-3009230 3009230 1 1 江东绝绁·狂 300000
-3009240 3009240 1 1 神格 400000
+3009030 3009030 1 1 镇敌 3 11 11 1 6 1 3 1000 50000 5505 0|[0,10] 10 1 200000
+3009050 3009050 1 1 射鼋 3 6 6 0 5000 5504 0|[4,23]|0 10 1 17 1 400000
+3009070 3009070 1 1 讨逆 3 4 1 1001 6 5000 0 10000 5001 4 2 5504 0|[17]|0 10 1 4 3 3 4 600000
+3009080 3009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 700000
+3009090 3009090 1 1 升变 3 0 6026 [4,23]|2|1 8 3009030 6027 50000 8 3009030 800000
+3009210 3009210 1 1 江东绝绁·极 6006 10000 8 3009020 100000
+3009230 3009230 1 1 江东绝绁·狂 6006 5000 8 30090201 6006 5000 8 3009070 300000
+3009240 3009240 1 1 神格 6026 []|5|1 8 3009030 400000
3010010 3010010 1 1 掠炎 1 1 1 1 1 0 0 1 0 12000 0 0 10000 23 5000|1|[4,23] 8 3 0 0 0 3|1 0 0 0 0 0 0 0 5000
3010020 3010020 1 1 枭姬箭羽 2 1 1 1 0 0 6 1 0 43000 0 0 10000 5008 [3,5]|1|30100201 13 0 0 0 4|1 0 0 0 0 0 0 0 50000
30100201 30100201 1 1 灼烧 0 4 1 1001 6 0 0 1 0 5000 0 0 10000 5001 4 2 0 0 0 4 3 1 0 4 0 0 0
@@ -675,7 +674,7 @@
40090201 40090201 1 1 链接 3 10 6 0 10000 29 2 2 0
4009030 4009030 1 1 狂歌 3 5 5 0 10000 16 1000|1 5011 40 1 34 2 5 3 1 2 200000
4009050 4009050 1 1 烛世 3 5 1 6 0 10000 35 2500|1 5024 34|[35,500,1]|500 23 3 5011 43 1 400000
-4009070 4009070 1 1 天罗 3 2 2 5 1 2500 0 10000 5504 0|29|1 26 1 5501 4009030|2 13 600000
+4009070 4009070 1 1 天罗 3 2 2 5 1 2500 0 10000 5504 0|[29]|1 26 1 5501 4009030|2 13 600000
4009080 4009080 1 1 怒气 3 0 0 6 5 0 0 0 0 0 50 0 10000 5011 1 1 700000
4009090 4009090 1 1 升变 3 0 35 100|11 8 1 800000
4009210 4009210 1 1 同命锁·极 4 5022 [17,5000,2]| 23 40090201 100000
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 eb5b030..f1e7250 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
@@ -23,18 +23,18 @@
107 2 2 20000 [] 1 2 15 1080 0 0
108 2 5 10 [] 2 10 15 3000 0 0
109 2 20 10 [] 2 100 15 5000 0 0
-200 3 11014 1 [] 0 1 43 1000 0 2 1000
-201 3 12013 1 [] 0 1 43 1000 0 2 1000
-202 3 13012 1 [] 0 1 43 1000 0 2 1000
-203 3 14013 1 [] 0 1 43 1000 0 2 1000
-204 3 11009 1 [] 0 1 43 800 0 2 1000
-205 3 12008 1 [] 0 1 43 800 0 2 1000
-206 3 13010 1 [] 0 1 43 800 0 2 1000
-207 3 14009 1 [] 0 1 43 800 0 2 1000
-208 3 11007 1 [] 0 1 43 250 0 2 1000
-209 3 12005 1 [] 0 1 43 250 0 2 1000
-210 3 13004 1 [] 0 1 43 250 0 2 1000
-211 3 14006 1 [] 0 1 43 250 0 2 1000
+200 3 11014 1 [] 0 1 43 640 0 2 1000
+201 3 12013 1 [] 0 1 43 640 0 2 1000
+202 3 13012 1 [] 0 1 43 640 0 2 1000
+203 3 14013 1 [] 0 1 43 640 0 2 1000
+204 3 11009 1 [] 0 1 43 160 0 2 1000
+205 3 12008 1 [] 0 1 43 160 0 2 1000
+206 3 13010 1 [] 0 1 43 160 0 2 1000
+207 3 14009 1 [] 0 1 43 160 0 2 1000
+208 3 11007 1 [] 0 1 43 40 0 2 1000
+209 3 12005 1 [] 0 1 43 40 0 2 1000
+210 3 13004 1 [] 0 1 43 40 0 2 1000
+211 3 14006 1 [] 0 1 43 40 0 2 1000
300 5 3 5 [] 0 50 55 20 0 0 0
301 5 12 2 [] 0 20 55 30 0 0 0
302 5 2 500 [] 0 40 55 40 0 0 0
@@ -42,8 +42,8 @@
304 5 8 20 [] 0 5 55 200 0 0 0
305 5 6 3 [] 0 5 55 300 0 0 0
306 5 13 4 [] 0 4 55 400 0 0 0
-307 5 5 5 [] 0 5 55 1000 0 0 0
-308 5 11009 1 [] 0 50 55 100 0 0 0
+307 5 5 5 [] 0 5 55 500 0 0 0
+308 5 11009 1 [] 0 50 55 75 0 0 0
10001 4 3 10 [] 1 1 1 0 50 0 0
10002 4 5 7 [] 1 1 1 1588 1960 0 0
10010 6 1 10 [[3,20]] 1 1 1 0 110 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Success.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Success.txt
index 6b4c95f..96c5e9b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Success.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Success.txt
@@ -9,15 +9,15 @@
8 1 810 [[1,200],[8,100],[5,10]]
9 1 910 [[1,200],[8,100],[14011,25]]
10 1 1010 [[1,200],[8,100],[5,10]]
-11 1 1110 [[1,200],[8,200],[5,10]]
+11 1 1110 [[1,200],[8,200],[5,10],[14013,10]]
12 1 1210 [[1,200],[8,200],[5,10]]
-13 1 1310 [[1,200],[8,200],[5,10]]
+13 1 1310 [[1,200],[8,200],[5,10],[14013,10]]
14 1 1410 [[1,200],[8,200],[5,10]]
-15 1 1510 [[1,200],[8,200],[5,10]]
+15 1 1510 [[1,200],[8,200],[5,10],[14013,10]]
16 1 1610 [[1,200],[8,200],[5,10]]
-17 1 1710 [[1,200],[8,200],[5,10]]
+17 1 1710 [[1,200],[8,200],[5,10],[14013,10]]
18 1 1810 [[1,200],[8,200],[5,10]]
-19 1 1910 [[1,200],[8,200],[5,10]]
+19 1 1910 [[1,200],[8,200],[5,10],[14013,10]]
20 1 2010 [[1,200],[8,200],[5,10]]
21 1 2310 [[1,200],[8,500],[5,20]]
22 1 2610 [[1,200],[8,500],[5,20]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
index fff674c..9931ef3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
@@ -50,11 +50,11 @@
1490 0 1 [205] 1 [[7,2000,0]]
1500 0 4 [41] 10 [[3,5,0]]
1510 0 15 [] 1 [[3,5,0]]
-1520 0 3 [] 10 [[3,5,0]]
+1520 0 4 [41] 10 [[3,5,0]]
1530 0 3 [] 10 [[3,5,0]]
-1540 0 1 [301] 1 [[3,5,0]]
-1550 0 16 [] 1 [[1,200,0]]
-1560 0 17 [] 2 [[3,5,0]]
+1540 0 1 [301] 1 [[1,50,0]]
+1550 0 4 [41] 10 [[3,5,0]]
+1560 0 3 [] 10 [[3,5,0]]
1570 0 14 [] 1 [[3,5,0]]
1580 0 3 [] 10 [[3,5,0]]
1590 0 1 [302] 1 [[3,5,0]]
@@ -75,7 +75,7 @@
1740 0 4 [41] 10 [[3,5,0]]
1750 0 3 [] 10 [[3,5,0]]
1760 0 1 [305] 1 [[3,5,0]]
-1770 0 18 [] 1 [[3,5,0]]
+1770 0 18 [] 1 [[1,100,0]]
1780 0 5 [] 23 [[7,3000,0]]
1790 0 8 [42] 500 [[3,5,0]]
1800 0 4 [41] 10 [[3,5,0]]
@@ -130,8 +130,8 @@
2290 0 3 [] 10 [[3,10,0]]
2300 0 8 [42] 500 [[3,10,0]]
2310 0 1 [407] 1 [[3,10,0]]
-2320 0 4 [41] 10 [[3,10,0]]
-2330 0 7 [] 5 [[3,10,0]]
+2320 0 16 [] 1 [[1,200,0]]
+2330 0 17 [] 2 [[3,10,0]]
2340 0 3 [] 10 [[3,10,0]]
2350 0 8 [42] 500 [[3,10,0]]
2360 0 1 [408] 1 [[3,10,0]]
--
Gitblit v1.8.0