From 7327aca22bdcf4c08c9c9aeec8e7f200c45af993 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 14 十一月 2025 16:03:32 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 f030d45..8283e9a 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
@@ -813,7 +813,7 @@
 6002010	6002010	1	1	刺击	1	1	2	1	1	0	0	1	0	6000	0	0	10000	0														1|3							
 6002020	6002020	1	1	鼓舞	2	5	0	1	0	1	0	2	0	0	0	0	10000	16	3000|1			0				0					0	1|4		2	1	5	3	0	
 6003010	6003010	1	1	重斩	1	1	1	1	1	0	0	1	0	7000	0	0	10000	5010	60030101	13												1|3							
-60030101	60030101	1	1	额外击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000					0				0					0		3	1	0	0	0	0	0
+60030101	60030101	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000					0				0					0		3	1	0	0	0	0	0
 6003020	6003020	1	1	刀盾连击	2	1	1	1	1	0	0	1	0	20000	0	0	10000	5010	60030201	13												1|4							
 60030201	60030201	1	1	护盾	0	5	0	1003	5	0	0	0	1	3000	0	0	10000	0				0				0					0	1|4	21	0	0	0	0	0	0
 6004010	6004010	1	1	弩箭	1	1	1	1	1	0	0	1	0	14000	0	0	10000															1|3							
@@ -827,7 +827,7 @@
 6007010	6007010	1	1	本能挥砍	1	1	1	1	1	0	0	1	0	10000	0	0	10000	5010	60070101	13		0				0					0	1|3	0	0	0	0	0	0	0
 60070101	60070101	1	1	流血	0	4	1	1001	6	0	0	0	0	7500	0	0	5000	5001		4	2	0				0					0		4	2	1	0	4	0	0
 6007020	6007020	1	1	粉身碎骨	2	1	1	1	1	0	0	1	0	25000	0	0	10000	5010	60070201	13												1|4							
-60070201	60070201	1	1	额外击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000	0				0				0					0		3	1	0	0	0	0	0
+60070201	60070201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000	0				0				0					0		3	1	0	0	0	0	0
 6008010	6008010	1	1	狂砍	1	1	2	1	1	0	0	1	0	15000	0	0	10000															1|3							
 6008020	6008020	1	1	剔骨	2	1	2	1	2	0	0	3	0	15000	0	0	10000	5010	60080201	13												1|4							
 60080201	60080201	1	1	生命恢复	0	2	1	2	5	1	0	1	2	5000	0	0	10000	0				0				0					0		0	0	0	0	0	0	

--
Gitblit v1.8.0