From fa8a84cc8653bb8f9b21785c498fb0d1ac459a01 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期四, 18 十二月 2025 21:40:55 +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 |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 6a0b80a..c9c67d7 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
@@ -329,12 +329,12 @@
 2012010	2012010	1	1	两仪	1	1	2	1	1	0	0	1	0	11000	0	0	10000	6006	5000|1	8	3	0				0					0	3|1	0	0		0	0	0	0	0	6000
 2012020	2012020	1	1	苍龙濯世	2	1	2	1	0	0	5	1	0	33000	0	0	10000	5010	20120201	13		5015	[100,40,30,20,10]|1	13		0					0	4|1	0	0		0	0	0	0	0	60000
 20120201	20120201	1	1	军令	0	6	0	0	6	0	0	0	0	0	0	0	10000														0		19	1		0	0	0	1	0	0
-2012030	2012030	1	1	北斗	3											0																									240000
-2012050	2012050	1	1	借东风	3											0																									480000
-2012070	2012070	1	1	八阵图	3											0																									720000
-2012080	2012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								840000
-2012090	2012090	1	1	升变	3											0																									960000
-2012210	2012210	1	1	苍龙濯世·极	4																																				120000
+2012030	2012030	1	1	北斗	3	5			5							0		5011		1	1	5012	1500|20120301|3000|35	51	2								35			7		3	1		240000
+20120301	20120301	1	1	北斗追击	1	1	2	1	1	0	0	1	0	11000	0	0	10000	5012	2000|2012010	20	3	0				0					0		0	0		0	0	0	0	0	42
+2012050	2012050	1	1	借东风	3	10				1		6				0	10000	67	2000|1			69	2000|1			5011		40	1												480000
+2012070	2012070	1	1	八阵图	3	0		6		1	5	1			25	0	10000	5011		28	1	5011		29	1																720000
+2012080	2012080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				840000
+2012210	2012210	1	1	苍龙濯世·极	4																												36								120000
 2012230	2012230	1	1	苍龙濯世·狂	4																																				360000
 2012240	2012240	1	1	神格	4																																				480000
 2013010	2013010	1	1	剑鸣	1	1	1	1	1	0	0	1	0	7000	0	0	10000	5004	[4]|1|1|1|3000	13		5010	20130101	13		0					0	3|1	0	0		0	0	0	0	0	6000

--
Gitblit v1.8.0