From 6b1e4ed27f6f092fc4ed2ac5d77ce17359b2ee4b Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 27 三月 2026 17:53:34 +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/Skill.txt | 19 ++++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 19 ++++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt | 4 ++--
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
index cba45f3..b409f3a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
@@ -30,7 +30,7 @@
520013 鍒樺 1 2 5 1 1 3 5200130 2013010 2013020 12500 10000 13500 {"25":2500} 4 0 3
520014 鍏崇窘 1 2 5 1 1 2 5200140 2014010 2014020 13500 10000 12500 {"23":2500} 4 0 2
520015 寮犻 1 2 5 1 1 1 5200150 2015010 2015020 12000 10000 14000 {"25":2500} 4 0 3
-520016 椹秴 1 2 5 1 1 2 5200160 2016010 2016020 13500 10000 12500 {"25":2500} 4 0 6
+520016 椹秴 1 2 5 1 1 2 5200160 2016010 2016020 13500 10000 12500 {"31":2500} 4 0 6
530001 娼樼拫 1 3 1 1 1 2 5300010 3001010 3001020 10000 7500 9500 {"23":2500} 0 2
530002 鍚村浗澶� 1 3 2 2 2 3 5300020 3002010 3002020 10500 8000 10000 {"27":2500} 1 4
530003 鍑岀粺 1 3 2 1 1 2 5300030 3003010 3003020 10500 8000 10000 {"31":2500} 0 6
@@ -46,7 +46,7 @@
530013 灏忎箶 1 3 5 2 2 3 5300130 3013010 3013020 13000 10000 13000 {"27":2500} 7 0 4
530014 姝ョ粌甯� 1 3 5 1 2 2 5300140 3014010 3014020 13500 10000 12500 {"23":2500} 0 2
530015 瀛欏潥 1 3 5 1 1 1 5300150 3015010 3015020 12000 10000 14000 {"27":2500} 0 4
-530016 闄嗛�� 1 3 5 1 1 4 5300160 3016010 3016020 12500 10000 13500 {"23":2500} 0 3
+530016 闄嗛�� 1 3 5 1 1 2 5300160 3016010 3016020 13500 10000 12500 {"25":2500} 0 3
540001 绾伒 1 4 1 1 1 4 5400010 4001010 4001020 10000 7500 9500 {"21":2500} 0 1
540002 閮睖 1 4 2 1 1 2 5400020 4002010 4002020 10500 8000 10000 {"31":2500} 13 0 6
540003 鏉庡倳 1 4 2 1 1 2 5400030 4003010 4003020 10500 8000 10000 {"27":2500} 13 0 4
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 dc1750f..24f9505 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
@@ -340,7 +340,7 @@
2013030 2013030 1 1 甘霂 3 2 0 2 0 1 1 1 0 13000 0 0 10000 5508 0|2000|4000 51 1 5010 20130301 13 5010 20130302 13 0 1 0 0 0 0 0 0 0 360000
20130301 20130301 1 1 移除 0 4000 5004 [4,6]|1|1|1|5000 13
20130302 20130302 1 1 减伤 0 5 0 0 6 0 0 0 0 0 0 0 10000 36 500 0 0 0 1 1 5 3 0 0
-2013050 2013050 1 1 白帝托孤 3 5 0 1003 0 1 0 6 0 25000 0 0 10000 5011 54 1 0 0 99 21 3 0 0 0 0 0 600000
+2013050 2013050 1 1 白帝托孤 3 5 0 1003 0 1 0 6 0 25000 0 0 10000 5011 54 1 7009 1|0 0 0 21 3 0 0 0 0 0 600000
2013070 2013070 1 1 桃园韫义 3 10 1 6 0 10000 5022 [56,2000,1]|[]|[102,56,2000,1] 23 3 6032 5|[4] 8 1 5011 40 1 840000
2013080 2013080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
2013210 2013210 1 1 仁德之主·极 4 6014 3000 8 20130301 120000
@@ -557,14 +557,15 @@
3015240 3015240 1 1 神格 4 6021 2 8 30150502 480000
3016010 3016010 1 1 葬秋风 1 1 1 1 0 0 0 1 0 16000 0 0 10000 5010 30160101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
30160101 30160101 1 1 复制 0 0 0 0 6 0 0 0 0 0 0 0 5000 5009 [4,23]|0 13 0 0 0 0 0 0 0 0 0 0 0
-3016020 3016020 1 1 火烧连营 2 1 1 1 0 0 0 6 0 13500 0 0 10000 5010 30160201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
+3016020 3016020 1 1 火烧连营 2 1 1 1 0 0 0 6 0 13500 0 0 10000 5010 30160201 13 5512 3016210|1 13 0 0 4|1 0 0 0 0 0 0 0 60000
30160201 30160201 1 1 引爆 0 0 1 0 6 0 0 0 0 0 0 0 4000 5020 1 13 0 0 0 0 0 0 0 0 0 0 0
3016030 3016030 1 1 号令 3 0 360000
-3016070 3016050 1 1 书剑同尘 3 1 1 1 1 0 0 1 0 26000 0 0 10000 5011 3 1 840000
-3016050 3016070 1 1 英姿 3 0 6014 7000 8 30160101 600000
+3016050 3016050 1 1 书剑同尘 3 1 1 1 1 0 0 1 0 26000 0 0 10000 5011 3 1 5010 30160501 13 1 840000
+30160501 30160501 1 1 引爆 0 0 1 0 6 0 0 0 0 0 0 0 4000 5020 1 13
+3016070 3016070 1 1 英姿 3 0 6014 7000 8 30160101 600000
3016080 3016080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
-3016090 3016090 1 1 升变 3 0 1080000
-3016210 3016210 1 1 火烧连营·极 4 120000
+3016090 3016090 1 1 升变 3 4 1 1001 0 0 0 6 0 3000 0 0 5000 5011 3 1 5001 4 2 7009 3|0 1 1080000
+3016210 3016210 1 1 火烧连营·极 4 4 1 1001 0 0 0 6 0 3000 0 0 1000 5001 4 2 0 0 0 4 2 1 0 4 0 0
3016230 3016230 1 1 火烧连营·狂 4 35 5000 8 30160201 360000
3016240 3016240 1 1 神格 4 480000
4001010 4001010 1 1 裂击 1 1 1 1 1 0 0 1 0 12000 0 0 10000 21 1000 8 3 0 0 0 3|1 0 0 0 0 0 0 0 2500
@@ -651,14 +652,14 @@
4009020 4009020 1 1 同命锁 2 1 1 1 0 0 5 1 0 45000 0 0 10000 5010 40090201 13 0 0 0 4|1 0 0 0 0 0 0 0 50000
40090201 40090201 1 1 链接 3 10 6 0 10000 29 2 2
4009030 4009030 1 1 狂歌 3 5 5 0 10000 16 700|1 5011 40 1 34 2 5 3 1 2 300000
-4009050 4009050 1 1 烛世 3 5 0 1 6 0 10000 35 2000|1 5024 34|[35,500,1]|500 23 3 5011 43 1 2 2 500000
+4009050 4009050 1 1 烛世 3 5 0 1 6 0 10000 35 2000|1 5024 34|[35,500,1]|0 23 3 5011 43 1 2 2 500000
4009070 4009070 1 1 天罗 3 2 2 5 1 2000 0 10000 5504 0|[29]|1 26 1 5501 4009030|2 13 700000
4009080 4009080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 800000
4009090 4009090 1 1 升变 3 0 35 50|11 8 1 900000
4009210 4009210 1 1 同命锁·极 4 5022 [17,5000,2]| 23 40090201 100000
4009230 4009230 1 1 同命锁·狂 4 6006 7000 8 4009020 5011 40092301 20 4009020 300000
40092301 40092301 1 1 嘲讽 0 6 2 0 6 0 0 0 0 0 10000 0 0 0 0 9 2 0 0 5 0 0
-4009240 4009240 1 1 神格 4 8 3 5 2000 10000 1 400000
+4009240 4009240 1 1 神格 4 8 3 5 3000 10000 1 400000
4010010 4010010 1 1 灭却斩 1 1 2 1 1 0 0 1 0 15000 0 0 10000 5011 40100101 31 3 0 0 0 3|1 0 0 0 0 0 0 0 5000
40100101 40100101 1 1 魂印 0 5 0 0 5 0 0 0 0 0 0 0 10000 73 800 74 800 0 0 0 1 5 3 1 2 0
4010020 4010020 1 1 天地寂灭斩 2 1 2 1 1 0 0 1 0 49000 0 0 10000 5011 40100201 16 3 0 0 0 4|1 0 0 0 0 0 0 0 50000
@@ -743,7 +744,7 @@
4016030 4016030 1 1 生生不息 3 5 0 0 5 0 0 0 0 0 0 0 10000 51 1000|1 5011 27 1 1 7 3 1 6 360000
4016050 4016050 1 1 撒豆成兵 3 8 0 3 0 2 3 3 1 3500 0 0 10000 5011 43 1 7009 1|0 480000
4016070 4016070 1 1 谪仙 3 15 0 0 0 1 11 1 0 0 0 0 10000 5011 33 1 5005 [14]|0 13 5010 40160701 13 600000
-40160701 40160701 1 1 攻击提高 0 5 0 0 6 0 0 0 0 0 0 0 10000 16 2500|1 6033 10000|[14] 8 2 0 0 0 2 0 0 0 0 0
+40160701 40160701 1 1 攻击提高 0 5 0 0 6 0 0 0 0 0 0 0 10000 16 3000|1 6033 10000|[14] 8 2 0 0 0 2 0 0 0 0 0
4016080 4016080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
4016090 4016090 1 1 升变 3 5 0 0 5 0 0 0 0 0 0 0 10000 5011 1 1 6033 10000|[14] 8 2 7009 1|0 4 1 1080000
4016210 4016210 1 1 镜花水月·极 4 0 0 6 6 0 0 0 0 5000 0 0 10000 100000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
index cba45f3..b409f3a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
@@ -30,7 +30,7 @@
520013 鍒樺 1 2 5 1 1 3 5200130 2013010 2013020 12500 10000 13500 {"25":2500} 4 0 3
520014 鍏崇窘 1 2 5 1 1 2 5200140 2014010 2014020 13500 10000 12500 {"23":2500} 4 0 2
520015 寮犻 1 2 5 1 1 1 5200150 2015010 2015020 12000 10000 14000 {"25":2500} 4 0 3
-520016 椹秴 1 2 5 1 1 2 5200160 2016010 2016020 13500 10000 12500 {"25":2500} 4 0 6
+520016 椹秴 1 2 5 1 1 2 5200160 2016010 2016020 13500 10000 12500 {"31":2500} 4 0 6
530001 娼樼拫 1 3 1 1 1 2 5300010 3001010 3001020 10000 7500 9500 {"23":2500} 0 2
530002 鍚村浗澶� 1 3 2 2 2 3 5300020 3002010 3002020 10500 8000 10000 {"27":2500} 1 4
530003 鍑岀粺 1 3 2 1 1 2 5300030 3003010 3003020 10500 8000 10000 {"31":2500} 0 6
@@ -46,7 +46,7 @@
530013 灏忎箶 1 3 5 2 2 3 5300130 3013010 3013020 13000 10000 13000 {"27":2500} 7 0 4
530014 姝ョ粌甯� 1 3 5 1 2 2 5300140 3014010 3014020 13500 10000 12500 {"23":2500} 0 2
530015 瀛欏潥 1 3 5 1 1 1 5300150 3015010 3015020 12000 10000 14000 {"27":2500} 0 4
-530016 闄嗛�� 1 3 5 1 1 4 5300160 3016010 3016020 12500 10000 13500 {"23":2500} 0 3
+530016 闄嗛�� 1 3 5 1 1 2 5300160 3016010 3016020 13500 10000 12500 {"25":2500} 0 3
540001 绾伒 1 4 1 1 1 4 5400010 4001010 4001020 10000 7500 9500 {"21":2500} 0 1
540002 閮睖 1 4 2 1 1 2 5400020 4002010 4002020 10500 8000 10000 {"31":2500} 13 0 6
540003 鏉庡倳 1 4 2 1 1 2 5400030 4003010 4003020 10500 8000 10000 {"27":2500} 13 0 4
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 dc1750f..24f9505 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
@@ -340,7 +340,7 @@
2013030 2013030 1 1 甘霂 3 2 0 2 0 1 1 1 0 13000 0 0 10000 5508 0|2000|4000 51 1 5010 20130301 13 5010 20130302 13 0 1 0 0 0 0 0 0 0 360000
20130301 20130301 1 1 移除 0 4000 5004 [4,6]|1|1|1|5000 13
20130302 20130302 1 1 减伤 0 5 0 0 6 0 0 0 0 0 0 0 10000 36 500 0 0 0 1 1 5 3 0 0
-2013050 2013050 1 1 白帝托孤 3 5 0 1003 0 1 0 6 0 25000 0 0 10000 5011 54 1 0 0 99 21 3 0 0 0 0 0 600000
+2013050 2013050 1 1 白帝托孤 3 5 0 1003 0 1 0 6 0 25000 0 0 10000 5011 54 1 7009 1|0 0 0 21 3 0 0 0 0 0 600000
2013070 2013070 1 1 桃园韫义 3 10 1 6 0 10000 5022 [56,2000,1]|[]|[102,56,2000,1] 23 3 6032 5|[4] 8 1 5011 40 1 840000
2013080 2013080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
2013210 2013210 1 1 仁德之主·极 4 6014 3000 8 20130301 120000
@@ -557,14 +557,15 @@
3015240 3015240 1 1 神格 4 6021 2 8 30150502 480000
3016010 3016010 1 1 葬秋风 1 1 1 1 0 0 0 1 0 16000 0 0 10000 5010 30160101 13 0 0 0 3|1 0 0 0 0 0 0 0 6000
30160101 30160101 1 1 复制 0 0 0 0 6 0 0 0 0 0 0 0 5000 5009 [4,23]|0 13 0 0 0 0 0 0 0 0 0 0 0
-3016020 3016020 1 1 火烧连营 2 1 1 1 0 0 0 6 0 13500 0 0 10000 5010 30160201 13 0 0 0 4|1 0 0 0 0 0 0 0 60000
+3016020 3016020 1 1 火烧连营 2 1 1 1 0 0 0 6 0 13500 0 0 10000 5010 30160201 13 5512 3016210|1 13 0 0 4|1 0 0 0 0 0 0 0 60000
30160201 30160201 1 1 引爆 0 0 1 0 6 0 0 0 0 0 0 0 4000 5020 1 13 0 0 0 0 0 0 0 0 0 0 0
3016030 3016030 1 1 号令 3 0 360000
-3016070 3016050 1 1 书剑同尘 3 1 1 1 1 0 0 1 0 26000 0 0 10000 5011 3 1 840000
-3016050 3016070 1 1 英姿 3 0 6014 7000 8 30160101 600000
+3016050 3016050 1 1 书剑同尘 3 1 1 1 1 0 0 1 0 26000 0 0 10000 5011 3 1 5010 30160501 13 1 840000
+30160501 30160501 1 1 引爆 0 0 1 0 6 0 0 0 0 0 0 0 4000 5020 1 13
+3016070 3016070 1 1 英姿 3 0 6014 7000 8 30160101 600000
3016080 3016080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
-3016090 3016090 1 1 升变 3 0 1080000
-3016210 3016210 1 1 火烧连营·极 4 120000
+3016090 3016090 1 1 升变 3 4 1 1001 0 0 0 6 0 3000 0 0 5000 5011 3 1 5001 4 2 7009 3|0 1 1080000
+3016210 3016210 1 1 火烧连营·极 4 4 1 1001 0 0 0 6 0 3000 0 0 1000 5001 4 2 0 0 0 4 2 1 0 4 0 0
3016230 3016230 1 1 火烧连营·狂 4 35 5000 8 30160201 360000
3016240 3016240 1 1 神格 4 480000
4001010 4001010 1 1 裂击 1 1 1 1 1 0 0 1 0 12000 0 0 10000 21 1000 8 3 0 0 0 3|1 0 0 0 0 0 0 0 2500
@@ -651,14 +652,14 @@
4009020 4009020 1 1 同命锁 2 1 1 1 0 0 5 1 0 45000 0 0 10000 5010 40090201 13 0 0 0 4|1 0 0 0 0 0 0 0 50000
40090201 40090201 1 1 链接 3 10 6 0 10000 29 2 2
4009030 4009030 1 1 狂歌 3 5 5 0 10000 16 700|1 5011 40 1 34 2 5 3 1 2 300000
-4009050 4009050 1 1 烛世 3 5 0 1 6 0 10000 35 2000|1 5024 34|[35,500,1]|500 23 3 5011 43 1 2 2 500000
+4009050 4009050 1 1 烛世 3 5 0 1 6 0 10000 35 2000|1 5024 34|[35,500,1]|0 23 3 5011 43 1 2 2 500000
4009070 4009070 1 1 天罗 3 2 2 5 1 2000 0 10000 5504 0|[29]|1 26 1 5501 4009030|2 13 700000
4009080 4009080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 800000
4009090 4009090 1 1 升变 3 0 35 50|11 8 1 900000
4009210 4009210 1 1 同命锁·极 4 5022 [17,5000,2]| 23 40090201 100000
4009230 4009230 1 1 同命锁·狂 4 6006 7000 8 4009020 5011 40092301 20 4009020 300000
40092301 40092301 1 1 嘲讽 0 6 2 0 6 0 0 0 0 0 10000 0 0 0 0 9 2 0 0 5 0 0
-4009240 4009240 1 1 神格 4 8 3 5 2000 10000 1 400000
+4009240 4009240 1 1 神格 4 8 3 5 3000 10000 1 400000
4010010 4010010 1 1 灭却斩 1 1 2 1 1 0 0 1 0 15000 0 0 10000 5011 40100101 31 3 0 0 0 3|1 0 0 0 0 0 0 0 5000
40100101 40100101 1 1 魂印 0 5 0 0 5 0 0 0 0 0 0 0 10000 73 800 74 800 0 0 0 1 5 3 1 2 0
4010020 4010020 1 1 天地寂灭斩 2 1 2 1 1 0 0 1 0 49000 0 0 10000 5011 40100201 16 3 0 0 0 4|1 0 0 0 0 0 0 0 50000
@@ -743,7 +744,7 @@
4016030 4016030 1 1 生生不息 3 5 0 0 5 0 0 0 0 0 0 0 10000 51 1000|1 5011 27 1 1 7 3 1 6 360000
4016050 4016050 1 1 撒豆成兵 3 8 0 3 0 2 3 3 1 3500 0 0 10000 5011 43 1 7009 1|0 480000
4016070 4016070 1 1 谪仙 3 15 0 0 0 1 11 1 0 0 0 0 10000 5011 33 1 5005 [14]|0 13 5010 40160701 13 600000
-40160701 40160701 1 1 攻击提高 0 5 0 0 6 0 0 0 0 0 0 0 10000 16 2500|1 6033 10000|[14] 8 2 0 0 0 2 0 0 0 0 0
+40160701 40160701 1 1 攻击提高 0 5 0 0 6 0 0 0 0 0 0 0 10000 16 3000|1 6033 10000|[14] 8 2 0 0 0 2 0 0 0 0 0
4016080 4016080 1 1 怒气 3 0 0 6 5 0 0 0 0 5000 0 0 10000 5011 1 1 960000
4016090 4016090 1 1 升变 3 5 0 0 5 0 0 0 0 0 0 0 10000 5011 1 1 6033 10000|[14] 8 2 7009 1|0 4 1 1080000
4016210 4016210 1 1 镜花水月·极 4 0 0 6 6 0 0 0 0 5000 0 0 10000 100000
--
Gitblit v1.8.0