From 198ce50ba67cd35c87cb71a41f30b103c0061a15 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 17 十二月 2025 15:32:22 +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/FuncOpenLV.txt     |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt          |   49 +++++++--------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt          |   49 +++++++--------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt           |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt  |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5025.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc                       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt           |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt    |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt  |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt     |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt    |    2 
 15 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index add0c89..ccff883 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/Player/PlayerTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
index d3a6fe5..683d555 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5025.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5025.pyc
new file mode 100644
index 0000000..4d1abf3
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5025.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.pyc
index 9703c90..9b52097 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_Attr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
index efaba8e..c8837a1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
index f21fc1b..62f9891 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncOpenLV.txt
@@ -2,7 +2,7 @@
 1	0	0	0		10103		[[1, 20]]
 2	0	0	1250				
 3	0	0	1350				
-4	50	0	0				[[1, 20]]
+4	100	0	0	14			[[1, 20]]
 5	335	0	0	30			
 6	70	0	0	7			
 7	96	0	0	2			[[1, 20]]
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 fb99ada..f4d564f 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
@@ -256,14 +256,13 @@
 2004240	2004240	1	1	神格																																					320000
 2005010	2005010	1	1	重岳	1	1	1	1	1	0	0	1	0	11000	0	0	10000	5012	10000	15	3	0				0					0	3|1	0	0		0	0	0	0	0	4000
 2005020	2005020	1	1	金戈铁马	2	1	1	1	1	0	0	1	0	25000	0	0	10000	5012	10000|2005010	15	3										0	4|1	0	0		0	0	0	0	0	40000
-2005030	2005030	1	1	狂澜	3											0																									160000
-2005050	2005050	1	1	龙骧	3											0																									320000
-2005070	2005070	1	1	死地	3											0																									480000
-2005080	2005080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								560000
-2005090	2005090	1	1	升变	3											0																									0
-2005210	2005210	1	1	金戈铁马·极																																					80000
-2005230	2005230	1	1	金戈铁马·狂																																					240000
-2005240	2005240	1	1	神格																																					320000
+2005030	2005030	1	1	狂澜	3	5			5							0	10000	31	1000|1			5011		20	2005010											1	3	3			160000
+2005050	2005050	1	1	龙骧	3	6			6							0	2000	38	2000|2			5011		20	2005010								15	1							320000
+2005070	2005070	1	1	死地	3	2		2	5				1	2000		0		5011		15	1																				480000
+2005080	2005080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				560000
+2005210	2005210	1	1	金戈铁马·极	4													6006	7000	8	2005020																				80000
+2005230	2005230	1	1	金戈铁马·狂	4													5011	2005050	20	2005020																				240000
+2005240	2005240	1	1	神格	4													65	5000|10|[15]	8	1																				320000
 2006010	2006010	1	1	甘泉	1	1	1	1	0	0	1	1	0	8000	0	0	10000	5010	20060101	13		0				0					0	3|1	0	0		0	0	0	0	0	4000
 20060101	20060101	1	1	甘泉	0	2	0	2	0	1	1	1	0	8000	0	0	10000					0				0					0		0	0		0	0	0	0	0	0
 2006020	2006020	1	1	云梦泽	2	2	1	2	0	1	1	2	0	24000	0	0	10000	5010	20060201	13		0				0					0	4|1	0	0		0	0	0	0	0	40000
@@ -509,15 +508,14 @@
 3011010	3011010	1	1	离雁	1	1	2	1	3	0	0	3	0	4000	0	0	10000	5010	30110101	13		0				0					0	3|1	0	0		0	0	0	0	0	5000
 30110101	30110101	1	1	灼烧	0	4	2	1001	6	0	0	1	0	3000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	0
 3011020	3011020	1	1	鹊桥星散	2	1	2	1	3	0	0	3	0	10000	0	0	10000	5010	30110201	13		0				0					0	4|1	0	0		0	0	0	0	0	50000
-30110201	30110201	1	1	破甲	0	6	0	1001	6	0	0	0	0	0	0	0	3500	56	5000|2			0				0					0		0	2		0	0	0	0	0	0
-3011030	3011030	1	1	暮云	3											0																									200000
-3011050	3011050	1	1	烛烬	3											0																									400000
-3011070	3011070	1	1	归巢	3											0																									600000
-3011080	3011080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								700000
-3011090	3011090	1	1	升变	3											0																									0
-3011210	3011210	1	1	鹊桥星散·极																																					100000
-3011230	3011230	1	1	鹊桥星散·狂																																					300000
-3011240	3011240	1	1	神格																																					400000
+30110201	30110201	1	1	易燃	0	6	0	1001	6	0	0	0	0	0	0	0	3500	56	5000|2			0				0					0		0	2		0	0	0	0	0	0
+3011030	3011030	1	1	暮云	3	4	2	1001	0	0	0	2	0	3000		0	5000	5001		4	2	5011		3	1								4	3		1	0	4	0	0	200000
+3011050	3011050	1	1	烛烬	3	4	2	1001	0	0	0	2	0	3000		0	5000	5001		4	2	5011		2	1								4	3		1	0	4	0	0	400000
+3011070	3011070	1	1	归巢	3											0		5025	[4,23]|1|1	28	1																				600000
+3011080	3011080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				700000
+3011210	3011210	1	1	鹊桥星散·极	4													6006	5000	8	3011020																				100000
+3011230	3011230	1	1	鹊桥星散·狂	4													6014	3500	8	30110201																				300000
+3011240	3011240	1	1	神格	4													65	5000|10|[4,23]|0|1	8	3011010																				400000
 3012010	3012010	1	1	焦尾	1	1	2	1	0	0	1	3	0	5000	0	0	10000	5010	30120101	13		0				0					0	3|1	0	0		0	0	0	0	0	6000
 30120101	30120101	1	1	灼烧	0	4	2	1001	6	0	0	0	0	5000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	0
 3012020	3012020	1	1	江枫渔祭	2	1	2	1	0	0	0	6	0	13000	0	0	10000	5010	30120201	13		6011	2500|[4,23]|1	8	3	0					0	4|1	0	0		0	0	0	0	0	60000
@@ -634,15 +632,14 @@
 4006010	4006010	1	1	南蛮劈山	1	1	1	1	4	0	0	2	0	7000	0	0	10000	5010	40060101	13		0				0					0	3|1	0	0		0	0	0	0	0	4000
 40060101	40060101	1	1	闪避	0	5	0	0	5	0	0	0	0	0	0	0	10000	27	2000|1			0				0					0		0	2		0	0	0	0	0	0
 4006020	4006020	1	1	万兽俯首	2	1	1	1	0	0	0	6	0	10000	0	0	10000	5010	40060201	13		0				0					0	4|1	0	0		0	0	0	0	0	40000
-40060201	40060201	1	1	抗闪避	0	6	0	0	5	0	0	0	0	0	0	0	10000	38	2500|1			0				0					0			2							0
-4006030	4006030	1	1	藤甲	3											0																									160000
-4006050	4006050	1	1	象冢	3											0																									320000
-4006070	4006070	1	1	御兽	3											0																									480000
-4006080	4006080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								560000
-4006090	4006090	1	1	升变	3											0																									640000
-4006210	4006210	1	1	万兽俯首·极																																					80000
-4006230	4006230	1	1	万兽俯首·狂																																					240000
-4006240	4006240	1	1	神格																																					320000
+40060201	40060201	1	1	物理减伤	0	5	0	0	5	0	0	0	0	0	0	0	10000	38	2500|1			0				0					0			2							0
+4006030	4006030	1	1	藤甲	3	5			5							0	10000	17	5000|1			5011		47	1									2							160000
+4006050	4006050	1	1	象冢	3	5		1003	0	1		6		50000		0	10000	5011		43	1												21	3							320000
+4006070	4006070	1	1	御兽	3	5		1003	5				1	600		0	10000	5011		33	1												21								480000
+4006080	4006080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				560000
+4006090	4006090	1	1	升变	3											0		5022	[17,15000,1]|	23	4006030																				640000
+4006210	4006210	1	1	万兽俯首·极														6006	10000	8	4006020																				80000
+4006230	4006230	1	1	万兽俯首·狂														5022	[38,2500,1]|	23	40060201																				240000
 4007010	4007010	1	1	八纳洞主	1	0	0	6	5	0	0	0	0	0	25	0	10000	7006				5011		4		0					0	3|1	0	0		0	0	0	0	0	4000
 4007020	4007020	1	1	飞火流星	2	1	2	1	0	0	0	6	0	8000	0	0	10000	7007				6018	50	8	3	5010	40070201	13			0	4|1	0	0		0	0	0	0	0	40000
 40070201	40070201	1	1	眩晕	0	14	0	0	5	0	0	0	0	0	0	0	10000	0				0				0					0		3	1		0	0	0	0	0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
index 66ff9f0..67c5cb7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Task.txt
@@ -9,7 +9,7 @@
 1080	0	8	[42]	100	[[2,200,0]]
 1090	0	7	[]	2	[[3,5,0]]
 1100	0	1	[102]	1	[[4,1,0]]
-1110	0	5	[]	3	[[7,1000,0]]
+1110	0	5	[]	3	[[7,300,0]]
 1120	0	14	[]	1	[[3,5,0]]
 1130	0	10	[103]	1	[[100409,1,118]]
 1140	0	1	[103]	1	[[7,1000,0]]
@@ -25,7 +25,7 @@
 1240	0	5	[]	8	[[3,5,0]]
 1250	0	1	[201]	1	[[6,1,0]]
 1260	0	11	[]	1	[[12,10,0]]
-1270	0	12	[]	10	[[13,10,0]]
+1270	0	12	[]	10	[[13,8,0]]
 1280	0	2	[]	4	[[3,5,0]]
 1290	0	5	[]	10	[[3,5,0]]
 1300	0	6	[]	2	[[3,5,0]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
index bf5d8d8..5bf54ab 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureHouse.txt
@@ -1,4 +1,4 @@
 TreasureType	MinLV	GridItemInfo	GridLibInfo	JobItemList	GridItemRateListFree	GridItemRateList1	GridItemRateList2	GridItemRateList3	GridItemRateList4	LuckyItemRateInfo
-5	0	{}	{"1":51,"2":52,"3":53,"4":54,"5":55}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[]	{"100":[(8000,4),(10000,5)], "200":[(10000,5)]}
-12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105, "100":200,"101":201,"102":202,"103":203}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[{1:[100, []]}, {1:[101, [[7000,102], [10000, 103]]]}]	{"100":[(8000,4),(10000,5)], "200":[(10000,5)]}
+5	0	{}	{"1":51,"2":52,"3":53,"4":54,"5":55}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[]	{"50":[(8000,4),(10000,5)], "100":[(10000,5)]}
+12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105, "100":200,"101":201,"102":202,"103":203}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[{1:[100, []]}, {1:[101, [[7000,102], [10000, 103]]]}]	{"50":[(8000,4),(10000,5)], "100":[(10000,5)]}
 13	0	{}	{"4":104,"5":105}	[]	[]	[(8000,4),(10000,5)]	[]	{}	[]	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
index 4ab2cbf..a1dbd2f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/TreasureSet.txt
@@ -1,4 +1,4 @@
 TreasureType	PackType	CheckPack	IsActType	DailyMaxCount	DailyFreeCount	TreasureCountList	RecycleItemMail	CostItemID	CostItemCountList	CostMoneyType	CostMoneyList	EnsureCount	OnceLucky	LuckyRateFormat	LuckyGridNum	GridNumMaxLimitInfo	NotifyGridNumList	NotifyKey	AwardMoneyType	AwardMoneyValue	WishOutput	WishReset	WishLibSelect
 5	2	1	0	99999	2	[1, 10]		5	[1, 10]	1	[100, 1000]	0	1	baseRate	5	{}	[5,6]		0	0	0	0	{}
-12	35	1	0	99999	3	[1, 10]		5	[1, 10]	1	[280, 2800]	0	1	baseRate	5	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	51	10	0	1	{"104":1, "105":1}
+12	35	1	0	99999	3	[1, 10]		5	[1, 10]	1	[280, 2800]	0	1	baseRate	5	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	0	0	0	1	{"104":1, "105":1}
 13	35	1	0	99999	0	[1, 10]		0	[]	51	[1000]	0	0	baseRate	0	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	0	0	0	0	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
index f21fc1b..62f9891 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncOpenLV.txt
@@ -2,7 +2,7 @@
 1	0	0	0		10103		[[1, 20]]
 2	0	0	1250				
 3	0	0	1350				
-4	50	0	0				[[1, 20]]
+4	100	0	0	14			[[1, 20]]
 5	335	0	0	30			
 6	70	0	0	7			
 7	96	0	0	2			[[1, 20]]
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 fb99ada..f4d564f 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
@@ -256,14 +256,13 @@
 2004240	2004240	1	1	神格																																					320000
 2005010	2005010	1	1	重岳	1	1	1	1	1	0	0	1	0	11000	0	0	10000	5012	10000	15	3	0				0					0	3|1	0	0		0	0	0	0	0	4000
 2005020	2005020	1	1	金戈铁马	2	1	1	1	1	0	0	1	0	25000	0	0	10000	5012	10000|2005010	15	3										0	4|1	0	0		0	0	0	0	0	40000
-2005030	2005030	1	1	狂澜	3											0																									160000
-2005050	2005050	1	1	龙骧	3											0																									320000
-2005070	2005070	1	1	死地	3											0																									480000
-2005080	2005080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								560000
-2005090	2005090	1	1	升变	3											0																									0
-2005210	2005210	1	1	金戈铁马·极																																					80000
-2005230	2005230	1	1	金戈铁马·狂																																					240000
-2005240	2005240	1	1	神格																																					320000
+2005030	2005030	1	1	狂澜	3	5			5							0	10000	31	1000|1			5011		20	2005010											1	3	3			160000
+2005050	2005050	1	1	龙骧	3	6			6							0	2000	38	2000|2			5011		20	2005010								15	1							320000
+2005070	2005070	1	1	死地	3	2		2	5				1	2000		0		5011		15	1																				480000
+2005080	2005080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				560000
+2005210	2005210	1	1	金戈铁马·极	4													6006	7000	8	2005020																				80000
+2005230	2005230	1	1	金戈铁马·狂	4													5011	2005050	20	2005020																				240000
+2005240	2005240	1	1	神格	4													65	5000|10|[15]	8	1																				320000
 2006010	2006010	1	1	甘泉	1	1	1	1	0	0	1	1	0	8000	0	0	10000	5010	20060101	13		0				0					0	3|1	0	0		0	0	0	0	0	4000
 20060101	20060101	1	1	甘泉	0	2	0	2	0	1	1	1	0	8000	0	0	10000					0				0					0		0	0		0	0	0	0	0	0
 2006020	2006020	1	1	云梦泽	2	2	1	2	0	1	1	2	0	24000	0	0	10000	5010	20060201	13		0				0					0	4|1	0	0		0	0	0	0	0	40000
@@ -509,15 +508,14 @@
 3011010	3011010	1	1	离雁	1	1	2	1	3	0	0	3	0	4000	0	0	10000	5010	30110101	13		0				0					0	3|1	0	0		0	0	0	0	0	5000
 30110101	30110101	1	1	灼烧	0	4	2	1001	6	0	0	1	0	3000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	0
 3011020	3011020	1	1	鹊桥星散	2	1	2	1	3	0	0	3	0	10000	0	0	10000	5010	30110201	13		0				0					0	4|1	0	0		0	0	0	0	0	50000
-30110201	30110201	1	1	破甲	0	6	0	1001	6	0	0	0	0	0	0	0	3500	56	5000|2			0				0					0		0	2		0	0	0	0	0	0
-3011030	3011030	1	1	暮云	3											0																									200000
-3011050	3011050	1	1	烛烬	3											0																									400000
-3011070	3011070	1	1	归巢	3											0																									600000
-3011080	3011080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								700000
-3011090	3011090	1	1	升变	3											0																									0
-3011210	3011210	1	1	鹊桥星散·极																																					100000
-3011230	3011230	1	1	鹊桥星散·狂																																					300000
-3011240	3011240	1	1	神格																																					400000
+30110201	30110201	1	1	易燃	0	6	0	1001	6	0	0	0	0	0	0	0	3500	56	5000|2			0				0					0		0	2		0	0	0	0	0	0
+3011030	3011030	1	1	暮云	3	4	2	1001	0	0	0	2	0	3000		0	5000	5001		4	2	5011		3	1								4	3		1	0	4	0	0	200000
+3011050	3011050	1	1	烛烬	3	4	2	1001	0	0	0	2	0	3000		0	5000	5001		4	2	5011		2	1								4	3		1	0	4	0	0	400000
+3011070	3011070	1	1	归巢	3											0		5025	[4,23]|1|1	28	1																				600000
+3011080	3011080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				700000
+3011210	3011210	1	1	鹊桥星散·极	4													6006	5000	8	3011020																				100000
+3011230	3011230	1	1	鹊桥星散·狂	4													6014	3500	8	30110201																				300000
+3011240	3011240	1	1	神格	4													65	5000|10|[4,23]|0|1	8	3011010																				400000
 3012010	3012010	1	1	焦尾	1	1	2	1	0	0	1	3	0	5000	0	0	10000	5010	30120101	13		0				0					0	3|1	0	0		0	0	0	0	0	6000
 30120101	30120101	1	1	灼烧	0	4	2	1001	6	0	0	0	0	5000	0	0	5000	5001		4	2	0				0					0		4	3		1	0	4	0	0	0
 3012020	3012020	1	1	江枫渔祭	2	1	2	1	0	0	0	6	0	13000	0	0	10000	5010	30120201	13		6011	2500|[4,23]|1	8	3	0					0	4|1	0	0		0	0	0	0	0	60000
@@ -634,15 +632,14 @@
 4006010	4006010	1	1	南蛮劈山	1	1	1	1	4	0	0	2	0	7000	0	0	10000	5010	40060101	13		0				0					0	3|1	0	0		0	0	0	0	0	4000
 40060101	40060101	1	1	闪避	0	5	0	0	5	0	0	0	0	0	0	0	10000	27	2000|1			0				0					0		0	2		0	0	0	0	0	0
 4006020	4006020	1	1	万兽俯首	2	1	1	1	0	0	0	6	0	10000	0	0	10000	5010	40060201	13		0				0					0	4|1	0	0		0	0	0	0	0	40000
-40060201	40060201	1	1	抗闪避	0	6	0	0	5	0	0	0	0	0	0	0	10000	38	2500|1			0				0					0			2							0
-4006030	4006030	1	1	藤甲	3											0																									160000
-4006050	4006050	1	1	象冢	3											0																									320000
-4006070	4006070	1	1	御兽	3											0																									480000
-4006080	4006080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000																								560000
-4006090	4006090	1	1	升变	3											0																									640000
-4006210	4006210	1	1	万兽俯首·极																																					80000
-4006230	4006230	1	1	万兽俯首·狂																																					240000
-4006240	4006240	1	1	神格																																					320000
+40060201	40060201	1	1	物理减伤	0	5	0	0	5	0	0	0	0	0	0	0	10000	38	2500|1			0				0					0			2							0
+4006030	4006030	1	1	藤甲	3	5			5							0	10000	17	5000|1			5011		47	1									2							160000
+4006050	4006050	1	1	象冢	3	5		1003	0	1		6		50000		0	10000	5011		43	1												21	3							320000
+4006070	4006070	1	1	御兽	3	5		1003	5				1	600		0	10000	5011		33	1												21								480000
+4006080	4006080	1	1	怒气	3	0	0	6	5	0	0	0	0	0	50	0	10000	5011		1	1																				560000
+4006090	4006090	1	1	升变	3											0		5022	[17,15000,1]|	23	4006030																				640000
+4006210	4006210	1	1	万兽俯首·极														6006	10000	8	4006020																				80000
+4006230	4006230	1	1	万兽俯首·狂														5022	[38,2500,1]|	23	40060201																				240000
 4007010	4007010	1	1	八纳洞主	1	0	0	6	5	0	0	0	0	0	25	0	10000	7006				5011		4		0					0	3|1	0	0		0	0	0	0	0	4000
 4007020	4007020	1	1	飞火流星	2	1	2	1	0	0	0	6	0	8000	0	0	10000	7007				6018	50	8	3	5010	40070201	13			0	4|1	0	0		0	0	0	0	0	40000
 40070201	40070201	1	1	眩晕	0	14	0	0	5	0	0	0	0	0	0	0	10000	0				0				0					0		3	1		0	0	0	0	0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
index 66ff9f0..67c5cb7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Task.txt
@@ -9,7 +9,7 @@
 1080	0	8	[42]	100	[[2,200,0]]
 1090	0	7	[]	2	[[3,5,0]]
 1100	0	1	[102]	1	[[4,1,0]]
-1110	0	5	[]	3	[[7,1000,0]]
+1110	0	5	[]	3	[[7,300,0]]
 1120	0	14	[]	1	[[3,5,0]]
 1130	0	10	[103]	1	[[100409,1,118]]
 1140	0	1	[103]	1	[[7,1000,0]]
@@ -25,7 +25,7 @@
 1240	0	5	[]	8	[[3,5,0]]
 1250	0	1	[201]	1	[[6,1,0]]
 1260	0	11	[]	1	[[12,10,0]]
-1270	0	12	[]	10	[[13,10,0]]
+1270	0	12	[]	10	[[13,8,0]]
 1280	0	2	[]	4	[[3,5,0]]
 1290	0	5	[]	10	[[3,5,0]]
 1300	0	6	[]	2	[[3,5,0]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
index bf5d8d8..5bf54ab 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureHouse.txt
@@ -1,4 +1,4 @@
 TreasureType	MinLV	GridItemInfo	GridLibInfo	JobItemList	GridItemRateListFree	GridItemRateList1	GridItemRateList2	GridItemRateList3	GridItemRateList4	LuckyItemRateInfo
-5	0	{}	{"1":51,"2":52,"3":53,"4":54,"5":55}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[]	{"100":[(8000,4),(10000,5)], "200":[(10000,5)]}
-12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105, "100":200,"101":201,"102":202,"103":203}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[{1:[100, []]}, {1:[101, [[7000,102], [10000, 103]]]}]	{"100":[(8000,4),(10000,5)], "200":[(10000,5)]}
+5	0	{}	{"1":51,"2":52,"3":53,"4":54,"5":55}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[]	{"50":[(8000,4),(10000,5)], "100":[(10000,5)]}
+12	0	{}	{"1":101,"2":102,"3":103,"4":104,"5":105, "100":200,"101":201,"102":202,"103":203}	[]	[]	[(5700,1),(8700,2),(9700,3),(9950,4),(10000,5)]	[]	{}	[{1:[100, []]}, {1:[101, [[7000,102], [10000, 103]]]}]	{"50":[(8000,4),(10000,5)], "100":[(10000,5)]}
 13	0	{}	{"4":104,"5":105}	[]	[]	[(8000,4),(10000,5)]	[]	{}	[]	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
index 4ab2cbf..a1dbd2f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/TreasureSet.txt
@@ -1,4 +1,4 @@
 TreasureType	PackType	CheckPack	IsActType	DailyMaxCount	DailyFreeCount	TreasureCountList	RecycleItemMail	CostItemID	CostItemCountList	CostMoneyType	CostMoneyList	EnsureCount	OnceLucky	LuckyRateFormat	LuckyGridNum	GridNumMaxLimitInfo	NotifyGridNumList	NotifyKey	AwardMoneyType	AwardMoneyValue	WishOutput	WishReset	WishLibSelect
 5	2	1	0	99999	2	[1, 10]		5	[1, 10]	1	[100, 1000]	0	1	baseRate	5	{}	[5,6]		0	0	0	0	{}
-12	35	1	0	99999	3	[1, 10]		5	[1, 10]	1	[280, 2800]	0	1	baseRate	5	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	51	10	0	1	{"104":1, "105":1}
+12	35	1	0	99999	3	[1, 10]		5	[1, 10]	1	[280, 2800]	0	1	baseRate	5	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	0	0	0	1	{"104":1, "105":1}
 13	35	1	0	99999	0	[1, 10]		0	[]	51	[1000]	0	0	baseRate	0	{}	[4,5]	{4:"HeroCall4", 5:"HeroCall5"}	0	0	0	0	{}

--
Gitblit v1.8.0