From 5a1a02074b90f0c7f9cef34232e687e5ed5a3e62 Mon Sep 17 00:00:00 2001
From: cjc <213123@qq.com>
Date: 星期一, 13 四月 2026 15:18:59 +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 |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 213ba47..9d0d794 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
@@ -369,19 +369,19 @@
 2015210	2015210	1	1	当阳啸·极	4													6014	1000	8	20150101																				120000
 2015230	2015230	1	1	当阳啸·狂	4	6			6								10000	5011		9	2015020	5510	5000|2015010|[44]	11	1							3|1	44	1							360000
 2015240	2015240	1	1	神格	4													5022	[51,1000,1]|	23	2015070																				480000
-2016010	2016010	1	1	银枪照雪	1	1	1	1	1	0	0	1	0	14500	0	0	10000	65	5000|14|50|1	8	3	5501	20160201|2	13		0					0	3|1	0	0		0	0	0	0	0	6000
-2016020	2016020	1	1	西凉铁风	2	1	1	1	1	0	0	1	0	53000	0	0	10000	5513	20160201|50	15	3	0				0					0	4|1	0	0		0	0	0	0	0	60000
-20160201	20160201	1	1	贯龙枪	0	5	0	0	5	0	0	0	0	0	0	0	10000	6011	3000|[20]|0|1	8	2016020|1	5514	20160202|500	67	4						0		20	0		1	7	3	0	0	0
+2016010	2016010	1	1	银枪照雪	1	1	1	1	1	0	0	1	0	15500	0	0	10000	65	5000|14|50|1	8	3	5501	20160201|2	13		0					0	3|1	0	0		0	0	0	0	0	6000
+2016020	2016020	1	1	西凉铁风	2	1	1	1	1	0	0	1	0	54000	0	0	10000	5513	20160201|50	15	2	0				0					0	4|1	0	0		0	0	0	0	0	60000
+20160201	20160201	1	1	贯龙枪	0	5	0	0	5	0	0	0	0	0	0	0	10000	6011	2500|[20]|0|1	8	2016020|1	5514	20160202|400	67	4						0		20	0		1	10	3	0	0	0
 20160202	20160202	1	1	贯龙枪回血	0	2		2	5				1	0		0	10000																								
 2016030	2016030	1	1	贯龙	3	0	0	0	0	0	0	0	0	0	0	0	10000	5501	20160201|1	48	1	5501	20160201|1	49	1	5501	20160201|1	68	1		0										360000
 2016050	2016050	1	1	苍狼	3	5	0	0	5	0	0	0	0	0	0	0	10000	5011		48	1	5011		49	1	5023	49|3|20160501	23	4				49			1	3	3	0		600000
-20160501	20160501	1	1	苍狼攻击	0	1	1	1	1	0	0	1	0	34000			10000	5501	20160201|1	13												1									
+20160501	20160501	1	1	苍狼攻击	0	1	1	1	1	0	0	1	0	34000			10000	5501	20160201|2	13												1									
 2016070	2016070	1	1	雪径孤骑	3	0	0	0	0	0	0	0	0	0	25	0	10000	5005	[14]|0|1	54	1	5513	20160201|100|2016020	54	1	7009	2|0														840000
 2016080	2016080	1	1	怒气	3	0	0	6	5	0	0	0	0	5000	0	0	10000	5011		1	1																				960000
-2016090	2016090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000	31	200|1			23	200|1			5515	0|1	67	20160201							1	20	3	1		1080000
-2016210	2016210	1	1	西凉铁风·极	4	0	0	0	0	0	0	0	0	0	0	0	10000	6006	5000	8	2016020	6012	2	8	20160201																120000
-2016230	2016230	1	1	西凉铁风·狂	4	5	0	0	0	0	0	0	0	0	0	0	10000	6006	5000	8	2016020	6012	2	8	20160201								20	0		2	2	0	0	0	360000
-2016240	2016240	1	1	神格	4	7	0	0	0	0	0	0	0	0	0	0	10000	5022	[45,200,1]|	23	2016090																				480000
+2016090	2016090	1	1	升变	3	5	0	0	5	0	0	0	0	0	0	0	10000	31	150|1			23	150|1			5515	0|1	67	20160201							1	30	3	1		1080000
+2016210	2016210	1	1	西凉铁风·极	4	0	0	0	0	0	0	0	0	0	0	0	10000	6006	5000	8	2016020	6012	3	8	20160201																120000
+2016230	2016230	1	1	西凉铁风·狂	4	5	0	0	0	0	0	0	0	0	0	0	10000	6006	5000	8	2016020	6012	3	8	20160201								20	0		3	3	0	0	0	360000
+2016240	2016240	1	1	神格	4	7	0	0	0	0	0	0	0	0	0	0	10000	5022	[45,150,1]|	23	2016090																				480000
 3001010	3001010	1	1	狂击	1	1	1	1	1	0	0	1	0	7000	0	0	10000	5010	30010101	13		0				0					0	3|1	0	0		0	0	0	0	0	2500
 30010101	30010101	1	1	灼烧	0	4	1	1001	6	0	0	0	0	8000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	0
 3001020	3001020	1	1	怒焰	2	1	1	1	1	0	0	1	0	34000	0	0	10000	5010	30010201	13		0				0					0	4|1	0	0		0	0	0	0	0	25000

--
Gitblit v1.8.0