From 523a43c2824a117e64d808ee1b6bf3e3544aa94a Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 17 三月 2026 11:13:35 +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/Skill.txt |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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 6c7e1b4..0e9a77a 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
@@ -206,7 +206,7 @@
 1016080	1016080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1																				960000
 1016090	1016090	1	1	升变	3													5022	[17,5000,2]|	23	10160301																				1080000
 1016210	1016210	1	1	天妒·极	4											0		5011	307	9	1016020																				120000
-1016230	1016230	1	1	天妒·狂	4													6003	2|[1,2]	8	1016020																				360000
+1016230	1016230	1	1	天妒·狂	4													6004	10000|[1,2]	8	1016020																				360000
 1016240	1016240	1	1	神格	4													6006	3500	8	1016020																				480000
 2001010	2001010	1	1	济世	1	1	2	1	1	0	0	1	0	13500	0	0	10000	0				0				0					0	3|1	0	0		0	0	0	0	0	2500
 2001020	2001020	1	1	千金一掷	2	2	2	2	0	1	1	2	0	21000	0	0	10000	0				0				0					0	4|1	0	0		0	0	0	0	0	25000
@@ -651,7 +651,7 @@
 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				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]|500	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
@@ -738,7 +738,7 @@
 4015230	4015230	1	1	苍天已死·狂	4													6014	500|1000	8	40150201																				360000
 4015240	4015240	1	1	神格	4													6014	1000	8	40150301																				480000
 4016010	4016010	1	1	生死符	1	2	0	2	0	1	1	3	0	10000	0	0	10000	0				0				0					0	3|1	0	0		0	0	0	0	0	6000
-4016020	4016020	1	1	镜花水月	2	8	0	3	0	1	3	1	0	1500	0	0	10000	5010	40160201	13		7011	40160202			0					0	4|1	0	0		0	0	0	0	0	60000
+4016020	4016020	1	1	镜花水月	2	8	0	3	0	1	3	1	1	2000	0	0	10000	5010	40160201	13		7011	40160202			0					0	4|1	0	0		0	0	0	0	0	60000
 40160201	40160201	1	1	复活治疗	0	2	1	2	6	1	0	0	0	15000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	
 40160202	40160202	1	1	治疗	0	2	1	2	0	1	1	1	0	55000	0	0	10000	0				0				0					0		0	0		0	0	0	0	0	
 4016030	4016030	1	1	生生不息	3											0																									360000

--
Gitblit v1.8.0