From fa868ea58f5e9a4d23dc575cacde79cb3aa44094 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 17 九月 2025 18:24:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroSkin.txt       |    6 +++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt          |   27 +++++++------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt          |   27 +++++++------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroSkin.txt       |    6 +++
 9 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index a4775c1..09e6431 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 1dd8b19..5fc80ac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.pyc
new file mode 100644
index 0000000..1f38e12
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_6004.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
index 1d88ab8..68748bc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 75e621a..af088fa 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroSkin.txt
index 463ce6d..be07167 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroSkin.txt
@@ -63,3 +63,9 @@
 5400140				
 5400150				
 5400160				
+6100010				
+6100020				
+6100030				
+6100040				
+6100050				
+6100060				
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 60087db..3772810 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
@@ -4,6 +4,8 @@
 300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
 301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	0	0	0	
 302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	0	0	0	
+303	303	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	3000	0				0				0				0		1	1	0	0	0	0	0	
+304	304	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	5000	0				0				0				0		1	1	0	0	0	0	0	
 1001	1001	1	1	铁甲	0	5	0	0	5	1	0	1	0	10000	0	0	10000	35	10000|1			0				0				0			99	0	0	0	0	0	
 1002	1002	1	1	灵体	0	5	0	0	5	1	0	1	0	10000	0	0	10000	36	10000|1			0				0				0			99	0	0	0	0	0	
 1003	1003	1	1	灵巧	0	5	0	0	5	1	0	1	0	10000	0	0	10000	37	10000|1			0				0				0			99	0	0	0	0	0	
@@ -112,8 +114,7 @@
 1011070	1011070	1	1	璇玑天衍	3											0																						0	
 1011080	1011080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1011090	1011090	1	1	升变	3											0																						0	
-1012010	1012010	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	0	10000	5010	10120101	13		0				0				0	0	0	0	0	0	0	0	0	attack
-10120101	10120101	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	3000	0				0				0				0		1	1	0	0	0	0	0	
+1012010	1012010	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	0	10000	5010	303	13		0				0				0	0	0	0	0	0	0	0	0	attack
 1012020	1012020	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	0	10000	5010	10120201	13		0				0				0	0	0	0	0	0	0	0	0	angerSkill
 10120201	10120201	1	1	权谋	0	4	2	1001	6	0	0	0	3	500	0	20000	3000	5003	1	4	2	5003	1	7	2	5010	10120202	14		0		15	3	7	0	3	0	0	
 10120202	10120202	1	1	权谋治疗	0	2	2	2	5	0	0	0	2	10000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	
@@ -123,18 +124,18 @@
 1012080	1012080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1012090	1012090	1	1	升变	3											0																						0	
 1013010	1013010	1	1	回春	1	1	2	1	1	0	0	1	0	6500	0	0	10000	5010	10130101	13		0				0				0	0	0	0	0	0	0	0	0	attack
-10130101	10130101	1	1	回春	0	2	2	1002	0	1	1	2	0	9000	0	0	10000													0	0	0	0	0	0	0	0	0	
+10130101	10130101	1	1	回春	0	2	2	2	0	1	1	2	0	9000	0	0	10000													0	0	0	0	0	0	0	0	0	
 1013020	1013020	1	1	长鲸饮涧	2	2	2	2	0	1	1	2	0	12000	0	0	10000	5010	10130201	13		0				0				0	0	0	0	0	0	0	0	0	angerskill
-10130201	10130201	1	1	长鲸饮涧	0	5	0	1003	6	0	0	2	0	20000	0	0	10000	0				0				0				0		0	3	0	0	0	0	0	
+10130201	10130201	1	1	长鲸饮涧	0	5	0	1003	6	0	0	2	0	20000	0	0	10000	23	2000|1			0				0				0		0	3	0	0	0	0	0	
 1013030	1013030	1	1	织命	3											0																						0	attack
 1013050	1013050	1	1	鹤唳霜华	3											0																						0	
 1013070	1013070	1	1	九霄环佩	3											0																						0	
 1013080	1013080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1013090	1013090	1	1	升变	3											0																						0	
-1014010	1014010	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	0	10000	5010	10140101	13										0		0	0	0	0	0	0	0	attack
-10140101	10140101	1	1	铭霜	0	4	0	1001	6	0	0	0	0	0	0	0	5000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-1014020	1014020	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	0	10000	5010	10140201											0		0	0	0	0	0	0	0	angerskill
-10140201	10140201	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	0	10000													0		0	0	0	0	0	0	0	
+1014010	1014010	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	0	10000	5010	304	13										0		0	0	0	0	0	0	0	attack
+1014020	1014020	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	0	10000	5010	10140201	13		5010	10140202	13						0		0	0	0	0	0	0	0	angerskill
+10140201	10140201	1	1	朔雪龙骧	0	2	1	2	5	1	0	1	2	5000	0	0	10000	6004	5000|[1]|1	8	3									0		0	0	0	0	0	0	0	
+10140202	10140202	1	1	朔雪龙骧	0	5	1	0	5	1	0	1	0	0	0	0	10000	23	1000|1											0		0	2	0	0	0	0	0	
 1014030	1014030	1	1	断虹	3											0																						0	
 1014050	1014050	1	1	玉翎	3											0																						0	
 1014070	1014070	1	1	威压三辰	3											0																						0	
@@ -156,16 +157,16 @@
 1016070	1016070	1	1	神机	3											0																						0	
 1016080	1016080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1016090	1016090	1	1	升变	3											0																						0	
-2001010	2001010	1	1	济世	1	1	2	1	1	0	0	1	0	10500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
-2001020	2001020	1	1	千金一掷	2	1	1	1	0	0	0	2	0	21000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
+2001010	2001010	1	1	济世	1	1	1	1	1	0	0	1	0	10500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
+2001020	2001020	1	1	千金一掷	2	2	1	2	0	1	1	2	0	21000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
 2001030	2001030	1	1	倾囊	3	2										0																						0	
 2001050	2001050	1	1	仁德	3	5										0																						0	
 2001070	2001070	1	1	流芳	3											0																						0	
 2001080	2001080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 2001090	2001090	1	1	升变	3											0																						0	
-2002010	2002010	1	1	流刃	1	1	1	1	2	0	0	3	0	4000	0	0	10000					0				0				0		0	0	0	0	0	0	0	attack
+2002010	2002010	1	1	流刃	1	1	2	1	2	0	0	3	0	4000	0	0	10000					0				0				0		0	0	0	0	0	0	0	attack
 2002020	2002020	1	1	无相	2	1	1	1	2	0	0	3	0	15000	0	0	10000	5010	20020201	13		0				0				0		0	0	0	0	0	0	0	angeskill
-20020201	20020201	1	1	无相	0	6	0	1001	5	1	0	1	0	0	0	0	10000	27	2000|1			0				0				0		0	2	0	0	0	0	0	
+20020201	20020201	1	1	无相	0	5	0	0	5	1	0	1	0	0	0	0	10000	27	2000|1			0				0				0		0	2	0	0	0	0	0	
 2002030	2002030	1	1	迷踪	3	1	1	1								0																						0	
 2002050	2002050	1	1	惊鸿	3											0																						0	
 2002070	2002070	1	1	回风舞雩	3	1	1	1								0																							
@@ -173,7 +174,7 @@
 2002090	2002090	1	1	升变	3											0																						0	
 2003010	2003010	1	1	镇岳	1	1	1	1	1	0	0	1	0	9500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	
 2003020	2003020	1	1	倾守	2	1	1	1	4	0	0	2	0	21000	0	0	10000	5010	20030201	13		0				0				0		0	0	0	0	0	0	0	
-20030201	20030201	1	1	倾守	0	6	0	1001	5	1	0	1	0	0	0	0	10000	29	2000|1			0				0				0		0	2	0	0	0	0	0	
+20030201	20030201	1	1	倾守	0	5	0	0	5	1	0	1	0	0	0	0	10000	29	2000|1			0				0				0		0	2	0	0	0	0	0	
 2003030	2003030	1	1	不息	3											0																						0	
 2003050	2003050	1	1	自愈	3											0																						0	
 2003070	2003070	1	1	山峦	3											0																						0	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroSkin.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroSkin.txt
index 463ce6d..be07167 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroSkin.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroSkin.txt
@@ -63,3 +63,9 @@
 5400140				
 5400150				
 5400160				
+6100010				
+6100020				
+6100030				
+6100040				
+6100050				
+6100060				
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 60087db..3772810 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
@@ -4,6 +4,8 @@
 300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
 301	301	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	10000	0				0				0				0		1	2	0	0	0	0	0	
 302	302	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	5000	0				0				0				0		1	2	0	0	0	0	0	
+303	303	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	3000	0				0				0				0		1	1	0	0	0	0	0	
+304	304	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	5000	0				0				0				0		1	1	0	0	0	0	0	
 1001	1001	1	1	铁甲	0	5	0	0	5	1	0	1	0	10000	0	0	10000	35	10000|1			0				0				0			99	0	0	0	0	0	
 1002	1002	1	1	灵体	0	5	0	0	5	1	0	1	0	10000	0	0	10000	36	10000|1			0				0				0			99	0	0	0	0	0	
 1003	1003	1	1	灵巧	0	5	0	0	5	1	0	1	0	10000	0	0	10000	37	10000|1			0				0				0			99	0	0	0	0	0	
@@ -112,8 +114,7 @@
 1011070	1011070	1	1	璇玑天衍	3											0																						0	
 1011080	1011080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1011090	1011090	1	1	升变	3											0																						0	
-1012010	1012010	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	0	10000	5010	10120101	13		0				0				0	0	0	0	0	0	0	0	0	attack
-10120101	10120101	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	0	3000	0				0				0				0		1	1	0	0	0	0	0	
+1012010	1012010	1	1	魅魉	1	1	2	1	0	0	0	3	0	3000	0	0	10000	5010	303	13		0				0				0	0	0	0	0	0	0	0	0	attack
 1012020	1012020	1	1	冢虎蚀谋	2	1	2	1	0	0	0	6	0	7000	0	0	10000	5010	10120201	13		0				0				0	0	0	0	0	0	0	0	0	angerSkill
 10120201	10120201	1	1	权谋	0	4	2	1001	6	0	0	0	3	500	0	20000	3000	5003	1	4	2	5003	1	7	2	5010	10120202	14		0		15	3	7	0	3	0	0	
 10120202	10120202	1	1	权谋治疗	0	2	2	2	5	0	0	0	2	10000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	
@@ -123,18 +124,18 @@
 1012080	1012080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1012090	1012090	1	1	升变	3											0																						0	
 1013010	1013010	1	1	回春	1	1	2	1	1	0	0	1	0	6500	0	0	10000	5010	10130101	13		0				0				0	0	0	0	0	0	0	0	0	attack
-10130101	10130101	1	1	回春	0	2	2	1002	0	1	1	2	0	9000	0	0	10000													0	0	0	0	0	0	0	0	0	
+10130101	10130101	1	1	回春	0	2	2	2	0	1	1	2	0	9000	0	0	10000													0	0	0	0	0	0	0	0	0	
 1013020	1013020	1	1	长鲸饮涧	2	2	2	2	0	1	1	2	0	12000	0	0	10000	5010	10130201	13		0				0				0	0	0	0	0	0	0	0	0	angerskill
-10130201	10130201	1	1	长鲸饮涧	0	5	0	1003	6	0	0	2	0	20000	0	0	10000	0				0				0				0		0	3	0	0	0	0	0	
+10130201	10130201	1	1	长鲸饮涧	0	5	0	1003	6	0	0	2	0	20000	0	0	10000	23	2000|1			0				0				0		0	3	0	0	0	0	0	
 1013030	1013030	1	1	织命	3											0																						0	attack
 1013050	1013050	1	1	鹤唳霜华	3											0																						0	
 1013070	1013070	1	1	九霄环佩	3											0																						0	
 1013080	1013080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1013090	1013090	1	1	升变	3											0																						0	
-1014010	1014010	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	0	10000	5010	10140101	13										0		0	0	0	0	0	0	0	attack
-10140101	10140101	1	1	铭霜	0	4	0	1001	6	0	0	0	0	0	0	0	5000	5010	300			0				0				0	0	1	1	0	0	0	0	0	
-1014020	1014020	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	0	10000	5010	10140201											0		0	0	0	0	0	0	0	angerskill
-10140201	10140201	1	1	朔雪龙骧		2	2	2	5	1	0	1	0	10000	0	0	10000													0		0	0	0	0	0	0	0	
+1014010	1014010	1	1	铭霜	1	1	1	1	4	0	0	2	0	5500	0	0	10000	5010	304	13										0		0	0	0	0	0	0	0	attack
+1014020	1014020	1	1	朔雪龙骧	2	1	1	1	4	0	0	2	0	24000	0	0	10000	5010	10140201	13		5010	10140202	13						0		0	0	0	0	0	0	0	angerskill
+10140201	10140201	1	1	朔雪龙骧	0	2	1	2	5	1	0	1	2	5000	0	0	10000	6004	5000|[1]|1	8	3									0		0	0	0	0	0	0	0	
+10140202	10140202	1	1	朔雪龙骧	0	5	1	0	5	1	0	1	0	0	0	0	10000	23	1000|1											0		0	2	0	0	0	0	0	
 1014030	1014030	1	1	断虹	3											0																						0	
 1014050	1014050	1	1	玉翎	3											0																						0	
 1014070	1014070	1	1	威压三辰	3											0																						0	
@@ -156,16 +157,16 @@
 1016070	1016070	1	1	神机	3											0																						0	
 1016080	1016080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 1016090	1016090	1	1	升变	3											0																						0	
-2001010	2001010	1	1	济世	1	1	2	1	1	0	0	1	0	10500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
-2001020	2001020	1	1	千金一掷	2	1	1	1	0	0	0	2	0	21000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
+2001010	2001010	1	1	济世	1	1	1	1	1	0	0	1	0	10500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
+2001020	2001020	1	1	千金一掷	2	2	1	2	0	1	1	2	0	21000	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
 2001030	2001030	1	1	倾囊	3	2										0																						0	
 2001050	2001050	1	1	仁德	3	5										0																						0	
 2001070	2001070	1	1	流芳	3											0																						0	
 2001080	2001080	1	1	怒气	3	1	0	6	5	1	0	0				0	10000																					0	
 2001090	2001090	1	1	升变	3											0																						0	
-2002010	2002010	1	1	流刃	1	1	1	1	2	0	0	3	0	4000	0	0	10000					0				0				0		0	0	0	0	0	0	0	attack
+2002010	2002010	1	1	流刃	1	1	2	1	2	0	0	3	0	4000	0	0	10000					0				0				0		0	0	0	0	0	0	0	attack
 2002020	2002020	1	1	无相	2	1	1	1	2	0	0	3	0	15000	0	0	10000	5010	20020201	13		0				0				0		0	0	0	0	0	0	0	angeskill
-20020201	20020201	1	1	无相	0	6	0	1001	5	1	0	1	0	0	0	0	10000	27	2000|1			0				0				0		0	2	0	0	0	0	0	
+20020201	20020201	1	1	无相	0	5	0	0	5	1	0	1	0	0	0	0	10000	27	2000|1			0				0				0		0	2	0	0	0	0	0	
 2002030	2002030	1	1	迷踪	3	1	1	1								0																						0	
 2002050	2002050	1	1	惊鸿	3											0																						0	
 2002070	2002070	1	1	回风舞雩	3	1	1	1								0																							
@@ -173,7 +174,7 @@
 2002090	2002090	1	1	升变	3											0																						0	
 2003010	2003010	1	1	镇岳	1	1	1	1	1	0	0	1	0	9500	0	0	10000	0				0				0				0		0	0	0	0	0	0	0	
 2003020	2003020	1	1	倾守	2	1	1	1	4	0	0	2	0	21000	0	0	10000	5010	20030201	13		0				0				0		0	0	0	0	0	0	0	
-20030201	20030201	1	1	倾守	0	6	0	1001	5	1	0	1	0	0	0	0	10000	29	2000|1			0				0				0		0	2	0	0	0	0	0	
+20030201	20030201	1	1	倾守	0	5	0	0	5	1	0	1	0	0	0	0	10000	29	2000|1			0				0				0		0	2	0	0	0	0	0	
 2003030	2003030	1	1	不息	3											0																						0	
 2003050	2003050	1	1	自愈	3											0																						0	
 2003070	2003070	1	1	山峦	3											0																						0	

--
Gitblit v1.8.0