From bafe3118ea0a0bb49cee37a606b05a34186675c7 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期四, 22 一月 2026 18:03:49 +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 |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

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 2475cc0..1658625 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
@@ -405,7 +405,7 @@
 3004020	3004020	1	1	狂热爪击	2	1	1	1	2	0	0	3	0	16000	0	0	10000	5010	30040201	13						0					0	4|1	0	0		0	0	0	0	0	40000
 30040201	30040201	1	1	灼烧	0	4	1	1001	6	0	0	0	0	7000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	
 3004030	3004030	1	1	战意	3	1	1	1	6	0	0	0	3	1000	0	0	10000	5010	3004030|[4,23]|0	9	3004010																				240000
-3004050	3004050	1	1	惊涛	3											0		43	2500|1	33	1															1	4	3	1		400000
+3004050	3004050	1	1	惊涛	3											0		43	2500|1	33	1	5001		20	3004020											1	4	3	1		400000
 3004070	3004070	1	1	游侠	3											0																									560000
 3004080	3004080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1					0					0					0	0	0	0	0	420000
 3004090	3004090	1	1	升变	3			8	6						25	0	10000	5010	0|[4,23]|1	13	3004020																				720000
@@ -601,7 +601,7 @@
 4005010	4005010	1	1	紫炎	1	1	1	1	3	0	0	1	0	14500	0	0	10000	0				0				0					0	3|1	0	0		0	0	0	0	0	4000
 4005020	4005020	1	1	破甲摧城	2	1	1	1	3	0	0	1	0	36000	0	0	10000	6016	10000	8	3	0				0					0	4|1	0	0		0	0	0	0	0	40000
 4005030	4005030	1	1	闪雷	3	5			5							0	10000	27	5000|1	2	1	5001	1	7	1												1	0			240000
-4005050	4005050	1	1	淬毒	3											0																									400000
+4005050	4005050	1	1	淬毒	3	5			5							0																	0	0		1		3			400000
 4005070	4005070	1	1	汲取	3											0																									560000
 4005080	4005080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1					0					0					0	0	0	0	0	420000
 4005090	4005090	1	1	升变	3											0																									720000
@@ -644,8 +644,7 @@
 4008210	4008210	1	1	阴后威仪·极														6006	6500	8	4008020																				100000
 4008230	4008230	1	1	阴后威仪·狂														6006	2000	8	40080201																				300000
 4008240	4008240	1	1	神格																																					0
-4009010	4009010	1	1	魔姬	1	1	1	1	1	0	0	1	0	26000	0	0	10000	5010	40090101	13		0				0					0	3|1	0	0		0	0	0	0	0	5000
-40090101	40090101	1	1	额外伤害	0	1	1	1	6	0	0	0	6	5000	0	0	10000	7008	5|0			0				0					0								0	0	
+4009010	4009010	1	1	魔姬	1	1	1	1	1	0	0	1	0	26000	0	0	10000	7008	5|0	13						0					0	3|1	0	0		0	0	0	0	0	5000
 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

--
Gitblit v1.8.0