From 0a2816dcee918bd7d9201d3a9edfec533c0a053a Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 21 十一月 2018 11:17:47 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt                                                |    5 ++
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                        |   14 +++---
 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt                                       |    2 -
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                                 |    5 ++
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                                          |   13 ++++--
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                        |    8 ++--
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                                        |    5 ++
 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt                                             |    2 -
 CoreServerGroup/GameServer/PySysDB/tagStore.txt                                                  |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    2 
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                                              |   13 ++++--
 11 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index e1893f5..0de0239 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -40,3 +40,8 @@
 39	WooliesSection3	[]	[]	2018-11-17	2018-11-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 40	WooliesSection4	[]	[]	2018-11-18	2018-11-18				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 41	WooliesSection5	[]	[]	2018-11-19	2018-11-19				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+42	WooliesSection6	[]	[]	2018-11-21	2018-11-21			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+43	WooliesSection7	[]	[]	2018-11-22	2018-11-22				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+44	WooliesSection8	[]	[]	2018-11-23	2018-11-23				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+45	WooliesSection9	[]	[]	2018-11-25	2018-11-25			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
+46	WooliesSection10	[]	[]	2018-11-26	2018-11-26				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 274d510..8be5c6f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -7,8 +7,8 @@
 6	OpenServer06	[]	[]	2018-8-6	2018-8-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
 7	OpenServer07	[]	[]	2018-8-7	2018-8-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
 8	OpenServer08	[]	[]	2018-8-8	2018-8-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-9	New4	[]	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-10	New5	[]	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+9	Test1	[]	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+10	Test2	[]	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
 11	NationalDay01	[]	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 12	NationalDay02	[]	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 13	NationalDay03	[]	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
@@ -17,11 +17,16 @@
 16	NationalDay06	[]	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 17	NationalDay07	[]	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 18	NationalDay08	[]	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-19	New4	[]	[]	2018-10-11	2018-10-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
-20	New5	[]	[]	2018-10-12	2018-10-12			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+19	Test3	[]	[]	2018-10-11	2018-10-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
+20	Test4	[]	[]	2018-10-12	2018-10-12			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	100	1
 21	WooliesSection1	[]	[]	2018-11-14	2018-11-14			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 22	WooliesSection2	[]	[]	2018-11-15	2018-11-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 23	WooliesSection3	[]	[]	2018-11-16	2018-11-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 24	WooliesSection4	[]	[]	2018-11-17	2018-11-17				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 25	WooliesSection5	[]	[]	2018-11-18	2018-11-18				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 26	WooliesSection6	[]	[]	2018-11-19	2018-11-19				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+27	New1	[]	[]	2018-11-21	2018-11-21			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+28	New2	[]	[]	2018-11-24	2018-11-24			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+29	New3	[]	[]	2018-11-25	2018-11-25				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+30	New4	[]	[]	2018-11-26	2018-11-26				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+31	New5	[]	[]	2018-11-27	2018-11-27				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index e4f17bf..d37a125 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -14,5 +14,3 @@
 13	New3	[]	[]	2018-11-18	2018-11-18	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
 14	New4	[]	[]	2018-11-19	2018-11-19	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
 15	New5	[]	[]	2018-11-20	2018-11-20	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-16	New6	[]	[]	2018-11-21	2018-11-21	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
-17	New7	[]	[]	2018-11-22	2018-11-22	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 86646d6..0977287 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -171,7 +171,7 @@
 774	108	0	0
 775	109	0	0
 776	110	0	0
-777	111	0	0
+777	110	0	0
 778	111	0	0
 779	112	0	0
 780	113	0	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index a7c55a2..b4eb2ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -108,7 +108,7 @@
 	#_100 前2座塔,等级碾压
 	"EVP_1_100"	:"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(suppressLV,1)*0.2*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 	#_101 后10座塔,等级压制
-	"EVP_1_101"	:"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressLV-10,0)*0.01,0.2)+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(max((suppressLV-10)*0.01,0),0.25)*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+	"EVP_1_101"	:"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressLV-10,0)*0.01,0.2)+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 
 
 	#BOSS境界压制公式
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 7fd8a85..a6060ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -31,12 +31,17 @@
 30	2018-10-6	2018-10-6				110	0	[[11]]	SellMail4	
 31	2018-10-7	2018-10-7				110	0	[[14]]	SellMail4	
 32	2018-10-8	2018-10-8				110	0	[[12]]	SellMail4	
-33	2018-11-9	2018-11-9			120	50	0	[[22]]	SellMail4	双11活动
-34	2018-11-10	2018-11-10				50	0	[[23]]	SellMail4	双11活动
-35	2018-11-11	2018-11-11				50	0	[[24]]	SellMail4	双11活动
-36	2018-11-12	2018-11-12				50	0	[[25]]	SellMail4	双11活动
+33	2018-11-9	2018-11-9			120	50	0	[[22]]	SellMail4	
+34	2018-11-10	2018-11-10				50	0	[[23]]	SellMail4	
+35	2018-11-11	2018-11-11				50	0	[[24]]	SellMail4	
+36	2018-11-12	2018-11-12				50	0	[[25]]	SellMail4	
 37	2018-11-14	2018-11-14			120	50	0	[[27]]	SellMail4	
 38	2018-11-15	2018-11-15				50	0	[[28]]	SellMail4	
 39	2018-11-17	2018-11-17			120	50	0	[[29]]	SellMail4	
 40	2018-11-18	2018-11-18				50	0	[[30]]	SellMail4	
 41	2018-11-19	2018-11-19				50	0	[[31]]	SellMail4	
+42	2018-11-21	2018-11-21			120	50	0	[[32]]	SellMail4	
+43	2018-11-22	2018-11-22				50	0	[[33]]	SellMail4	
+44	2018-11-23	2018-11-23				50	0	[[34]]	SellMail4	
+45	2018-11-25	2018-11-25			120	50	0	[[35]]	SellMail4	
+46	2018-11-26	2018-11-26				50	0	[[36]]	SellMail4	
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 2810c49..9197622 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -25,3 +25,8 @@
 24	2018-11-17	2018-11-17				110	0	[[112]]	SellMail3	
 25	2018-11-18	2018-11-18				110	0	[[113]]	SellMail3	
 26	2018-11-19	2018-11-19				110	0	[[114]]	SellMail3	
+27	2018-11-21	2018-11-21			120	110	0	[[109]]	SellMail3	
+28	2018-11-24	2018-11-24			120	110	0	[[110]]	SellMail3	
+29	2018-11-25	2018-11-25				110	0	[[111]]	SellMail3	
+30	2018-11-26	2018-11-26				110	0	[[112]]	SellMail3	
+31	2018-11-27	2018-11-27				110	0	[[113]]	SellMail3	
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index f52377f..850b923 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -14,5 +14,3 @@
 13	2018-11-18	2018-11-18	5	0	5
 14	2018-11-19	2018-11-19	5	0	5
 15	2018-11-20	2018-11-20	5	0	5
-16	2018-11-21	2018-11-21	5	0	5
-17	2018-11-22	2018-11-22	5	0	5
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 71e68df..e71b934 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -30,3 +30,8 @@
 4	29	110	1	[(4694,6,1),(913,1,1)]	913	LimitGift3
 4	30	100	1	[(2213,40,1),(4608,1,1)]	4608	LimitGift3
 2	31	33	1	[(4184,1,1),(5303,100,1)]	4184	LimitGift3
+4	32	100	1	[(4680,1,1),(4681,1,1)]	4681	LimitGift3
+2	33	33	1	[(2213,10,1),(4610,1,1)]	4610	LimitGift3
+4	34	130	1	[(4606,1,1),(2213,20,1)]	4606	LimitGift3
+4	35	110	1	[(4694,6,1),(913,1,1)]	913	LimitGift3
+2	36	30	1	[(108,5,1),(109,1,1)]	109	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f212445..26487ee 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -169,13 +169,13 @@
 772	108	1	153	80	1	[[147,6,1]]	153		0	0	0	1	0	1	88	630	0	LimitGift6	
 773	108	1	4606	1	1	[[2213,70,1]]	4606		0	0	0	1	0	1	288	8750	0	LimitGift7	
 774	108	1	982	10	1	[]	982		0	0	0	1	0	1	888	2500	0	LimitGift8	
-775	109	1	4681	1	1	[[4010,24,1]]	4681		0	0	0	1	0	1	588	2170	0	LimitGift6	
-776	110	1	1128	1	1	[[4657,1,1]]	1128		0	0	0	1	0	1	58	350	0	LimitGift6	
-777	111	1	983	10	1	[]	983		0	0	0	1	0	1	58	300	0	LimitGift6	
-778	111	1	4306	2000	1	[]	4306		0	0	0	1	0	1	588	2000	0	LimitGift7	
-779	112	1	4151	40	1	[[912,2,1]]	912		0	0	0	1	0	1	188	700	0	LimitGift6	
-780	113	1	2213	10	1	[[4610,1,1]]	4610		0	0	0	1	0	1	58	325	0	LimitGift6	
-781	113	1	982	10	1	[]	983		0	0	0	1	0	1	888	2500	0	LimitGift7	
+775	109	1	4007	2	1	[[30,100,1]]	4007		0	0	0	1	0	1	88	260	0	LimitGift6	
+776	110	1	1503	2	1	[[966,2,1]]	1503		0	0	0	1	0	1	88	300	0	LimitGift6	
+777	110	1	153	200	1	[[5303,500,1]]	153		0	0	0	1	0	1	588	1700	0	LimitGift7	
+778	111	1	912	2	1	[]	912		0	0	0	1	0	1	88	300	0	LimitGift6	
+779	112	1	983	30	1	[]	983		0	0	0	1	0	1	188	900	0	LimitGift6	
+780	113	1	4181	5	1	[[4182,1,1]]	4182		0	0	0	1	0	1	88	550	0	LimitGift6	
+781	113	1	2346	6	1	[]	2346		0	0	0	1	0	1	588	1620	0	LimitGift7	
 782	114	1	4007	6	1	[[144,100,1]]	4007		0	0	0	1	0	1	188	780	0	LimitGift6	
 801	19	0	2391	1	0	[]	0		0	0	0	0	0	1	60	0	0		
 802	19	0	2393	1	0	[]	0		0	0	0	0	0	1	60	0	0		
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2b28467..cec47ff 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -659,10 +659,10 @@
 60103006	2	0	残暴凶狼	56	0	175	175	0	0	0	0	10000	705	0	0	0	0	0	0	32456	100	2500	408070	17	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	17267	0	0	0	0	3	0	0	180	1	1
 60103007	2	0	幽魂邪道	70	0	178	178	0	0	0	0	10000	795	0	0	0	0	0	0	51323	100	2500	453622	18	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	21440	0	0	0	0	3	0	0	180	1	1
 60103008	2	0	狂躁巨猿	80	0	181	181	0	0	0	0	10000	886	0	0	0	0	0	0	71242	100	2500	505817	19	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	30932	0	0	0	0	3	0	0	180	1	1
-60103009	2	0	守塔剑士	90	0	503	503	0	0	0	0	40000	914	0	0	0	0	0	0	98451	101	2500	556113	20	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	47772	0	0	0	0	3	0	0	180	1	1
-60103010	2	0	巨剑师	100	0	610	610	0	0	0	0	40000	1010	0	0	0	0	0	0	116886	101	2500	608308	22	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	66969	0	0	0	0	3	0	0	180	1	1
-60103011	2	0	符塔剑魂	105	0	896	896	0	0	0	0	40000	1060	0	0	0	0	0	0	123634	101	2500	659554	23	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	81872	0	0	0	0	3	0	0	180	1	1
-60103012	2	0	符塔剑尊	110	0	1096	1096	0	0	0	0	40000	1110	0	0	0	0	0	0	137638	101	2500	710800	24	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	109859	0	0	0	0	3	0	0	180	1	1
+60103009	2	0	守塔剑士	90	0	503	503	0	0	0	0	40000	914	0	0	0	0	0	0	98451	100	2500	556113	20	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	47772	0	0	0	0	3	0	0	180	1	1
+60103010	2	0	巨剑师	100	0	610	610	0	0	0	0	40000	1010	0	0	0	0	0	0	116886	100	2500	608308	22	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	66969	0	0	0	0	3	0	0	180	1	1
+60103011	2	0	符塔剑魂	105	0	896	896	0	0	0	0	40000	1060	0	0	0	0	0	0	123634	100	2500	659554	23	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	81872	0	0	0	0	3	0	0	180	1	1
+60103012	2	0	符塔剑尊	110	0	1096	1096	0	0	0	0	40000	1110	0	0	0	0	0	0	137638	100	2500	710800	24	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	109859	0	0	0	0	3	0	0	180	1	1
 60103013	2	0	守塔哨兵	115	0	1503	1503	0	0	0	0	40000	3498	0	0	0	0	0	0	161609	101	2500	344487	17	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	101405	0	0	0	0	3	0	0	180	1	1
 60103014	2	0	仙人掌球球	120	0	1690	1690	0	0	0	0	40000	3819	0	0	0	0	0	0	191114	101	2500	358722	18	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	111697	0	0	0	0	3	0	0	180	1	1
 60103015	2	0	封印花妖	125	0	1930	1930	0	0	0	0	40000	4260	0	0	0	0	0	0	240136	101	2500	372957	19	0	300	2	5	0	0	0	0	0	0	0	0	0	40	2	146065	0	0	0	0	3	0	0	180	1	1

--
Gitblit v1.8.0