From 854f2acdcab1dad6e64bad3976beee261c7718b4 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 21 九月 2018 21:06:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt                           |    2 
 db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt                           |   14 +++---
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                  |   16 ++++----
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                           |   24 ++++++------
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                   |   24 ++++++------
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                              |    4 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip               |    0 
 8 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index f899176..5d600d7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -432,18 +432,18 @@
 20203007	荒漠巨兽	405
 20302001	小宝箱	1
 20302002	大宝箱	1
-20302003	金甲蛮牛	155
-20302004	灵鲛斗士	175
-20302005	紫炎灵狮	210
-20302006	金甲剑士	230
-20302007	黄金战将	260
-20303001	残暴古熊王	105
-20303002	魅影蛛皇	145
-20303003	紫金貔貅	160
-20303004	双翼角兽	180
-20303005	金甲蛮狮	215
-20303006	麒麟瑞兽	235
-20303007	金色战神	265
+20302003	金甲蛮牛	265
+20302004	灵鲛斗士	275
+20302005	紫炎灵狮	285
+20302006	金甲剑士	295
+20302007	黄金战将	305
+20303001	残暴古熊王	265
+20303002	魅影蛛皇	275
+20303003	紫金貔貅	285
+20303004	双翼角兽	295
+20303005	金甲蛮狮	305
+20303006	麒麟瑞兽	315
+20303007	金色战神	325
 30102001	凶狼	50
 30102002	巨虎	50
 30102003	幼龙	50
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index f2fab52..6cef8c7 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 38bfd97..56d487e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d094e87..2220283 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -47,14 +47,14 @@
 31220	0	31220	110	0	0	0	0	0	0	0	0	[12,23]				
 31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[900,[30,20,10,9,8,7,6,5,4,3,2,1]]			
 31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[5,1800,15,101]			
-51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[10,600,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[135,33,33,33,33]	[793536, [141,30]]
-51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[10,600,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[135,33,33,33,33]	[831840, [141,36], [142,9]]
-51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[10,600,10]	[{5101031:1, 5101032:1}]	[150,38,38,38,38]	[1017600, [141,9], [142,18], [143,3]]
-51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[10,600,10]	[{5101041:0, 5101042:1}]	[150,38,38,38,38]	[1169280, [142,36], [143,9]]
-51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[10,600,10]	[{5101051:1, 5101052:0}]	[150,38,38,38,38]	[1404720, [142,9], [143,18], [144,3]]
-51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[10,600,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[150,38,38,38,38]	[1666080, [143,36], [144,9]]
-51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[10,600,10]	[{5101071:1, 5101072:0}]	[150,38,38,38,38]	[1953360, [144,45]]
-51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[10,600,10]	[{5101081:1}]	[150,38,38,38,38]	[2265840, [153,30]]
+51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[10,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[135,33,33,33,33]	[793536, [141,30]]
+51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[10,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[135,33,33,33,33]	[831840, [141,36], [142,9]]
+51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[10,360,10]	[{5101031:1, 5101032:1}]	[150,38,38,38,38]	[1017600, [141,9], [142,18], [143,3]]
+51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[10,360,10]	[{5101041:0, 5101042:1}]	[150,38,38,38,38]	[1169280, [142,36], [143,9]]
+51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[10,360,10]	[{5101051:1, 5101052:0}]	[150,38,38,38,38]	[1404720, [142,9], [143,18], [144,3]]
+51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[10,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[150,38,38,38,38]	[1666080, [143,36], [144,9]]
+51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[10,360,10]	[{5101071:1, 5101072:0}]	[150,38,38,38,38]	[1953360, [144,45]]
+51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[10,360,10]	[{5101081:1}]	[150,38,38,38,38]	[2265840, [153,30]]
 60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[10,1800,50,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
 60010	1	60010	150	500	0	0	0	0	0	0	0	[208,24]	[10,1800,50,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
 60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[10,1800,50,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5897090..bdaac8a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -266,9 +266,9 @@
 GoldInvestLVLimit	300				
 OfflinePostItem	181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502				
 TreasureSet	{0:10,1:10}	{2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}			
-TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 8]]	[0, 0]	[10, 100]
+TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 10]]	[0, 0]	[10, 100]
 TreasureSet21	max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10))	[1, 10]	1000		
-TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 8]]	[1440, 0]	[5, 50]
+TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 10]]	[1440, 0]	[5, 50]
 TreasureSet22	min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))	[1, 10]	1000		
 OpenServerRedPacketType	5				
 OSRAllMoneySys	[100,300,500,800,1000,1200,1500,1800]				
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 83c13ca..fc7e21d 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
 8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	50000	{"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
 9	8	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
 10	7	0	50	0	{"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*1330944+max(min(4,extraData)-3,0)*1628160+max(min(5,extraData)-4,0)*1870848+max(min(6,extraData)-5,0)*2247552+max(min(7,extraData)-6,0)*2665728+max(min(8,extraData)-7,0)*3125376"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*1330944+max(min(4,extraData)-3,0)*1628160+max(min(5,extraData)-4,0)*1870848+max(min(6,extraData)-5,0)*2247552+max(min(7,extraData)-6,0)*2665728+max(min(8,extraData)-7,0)*3125376"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
 12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	200000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
 13	12	0	20	0	{"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index a63b53a..04f8296 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -13,22 +13,22 @@
 1	12	660800	0	142|143|144|153	9|9|9|9	8000|8000|8000|8000
 1	13	737046	0	142|143|144|153	10|10|10|10	8000|8000|8000|8000
 1	14	813292	0	142|143|144|153	10|10|10|10	8000|8000|8000|8000
-1	15	1067446	0	143|144|153	8|8|8|8	8000|8000|8000
+1	15	1067446	0	143|144|153	8|8|8	8000|8000|8000
 1	16	1321599	0	143|144|153	12|12|12	8000|8000|8000
 1	17	1575753	0	143|144|153	16|16|16	8000|8000|8000
 1	18	1829907	0	143|144|153	20|20|20	8000|8000|8000
 1	19	2084060	0	143|144|153	23|23|23	8000|8000|8000
-1	20	2719445	0	144|153	24|24|24	8000|8000
+1	20	2719445	0	144|153	24|24	8000|8000
 1	21	3354829	0	144|153	30|30	8000|8000
 1	22	3990213	0	144|153	36|36	8000|8000
 1	23	4625597	0	144|153	42|42	8000|8000
 1	24	5260982	0	144|153	48|48	8000|8000
 1	25	5896366	0	144|153	61|61	8000|8000
-2	1	51329	0	142|143|144|153	2|2|2	8000|8000|8000|8000
-2	2	102657	0	142|143|144|153	3|3|3	8000|8000|8000|8000
-2	3	153986	0	142|143|144|153	5|5|5	8000|8000|8000|8000
-2	4	205314	0	142|143|144|153	6|6|6	8000|8000|8000|8000
-2	5	256643	0	142|143|144|153	7|7|7	8000|8000|8000|8000
+2	1	51329	0	142|143|144|153	2|2|2|2	8000|8000|8000|8000
+2	2	102657	0	142|143|144|153	3|3|3|3	8000|8000|8000|8000
+2	3	153986	0	142|143|144|153	5|5|5|5	8000|8000|8000|8000
+2	4	205314	0	142|143|144|153	6|6|6|6	8000|8000|8000|8000
+2	5	256643	0	142|143|144|153	7|7|7|7	8000|8000|8000|8000
 2	6	427738	0	143|144|153	7|7|7	8000|8000|8000
 2	7	598833	0	143|144|153	10|10|10	8000|8000|8000
 2	8	769928	0	143|144|153	13|13|13	8000|8000|8000
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index cf3cee4..fcb7816 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -432,18 +432,18 @@
 20203007	2	0	荒漠巨兽	405	0	68355	68355	0	22	0	0	10000	42593	0	1	0	0	0	0	0	3	3000	2181751	51	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	37074369	18	10000	0	0	5	0	0	186	1	1
 20302001	14	0	小宝箱	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	0	0	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	214	0	1
 20302002	14	0	大宝箱	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	0	0	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	214	0	1
-20302003	2	0	金甲蛮牛	155	0	22606	22606	0	0	0	0	0	1697	0	0	0	0	0	0	0	3	3000	2210221	53	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	16399364	1	0	0	0	1	51649324	0	1	1	1
-20302004	2	0	灵鲛斗士	175	0	24033	24033	0	0	0	0	0	1708	0	0	0	0	0	0	0	3	3000	2224456	54	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	30624216	1	0	0	0	1	59423628	0	1	1	1
-20302005	2	0	紫炎灵狮	210	0	25926	25926	0	0	0	0	0	1723	0	0	0	0	0	0	0	3	3000	2238691	55	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	41864663	1	0	0	0	1	68578949	0	1	1	1
-20302006	2	0	金甲剑士	230	0	27295	27295	0	0	0	0	0	1875	0	0	0	0	0	0	0	3	3000	2252926	56	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	50269412	1	0	0	0	1	79339802	0	1	1	1
-20302007	2	0	黄金战将	260	0	28669	28669	0	0	0	0	0	1890	0	0	0	0	0	0	0	3	3000	2267161	57	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	58156392	1	0	0	0	1	91963645	0	1	1	1
-20303001	2	0	残暴古熊王	105	0	78234	78234	0	0	0	0	10000	70893	0	1	0	0	0	0	0	3	3000	2167516	50	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	42441524	26	10000	0	0	5	0	0	186	1	1
-20303002	2	0	魅影蛛皇	145	0	88811	88811	0	0	0	0	10000	76760	0	1	0	0	0	0	0	3	3000	2189343	51	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	19649977	30	10000	0	0	5	0	0	186	1	1
-20303003	2	0	紫金貔貅	160	0	94571	94571	0	0	0	0	10000	79404	0	1	0	0	0	0	0	3	3000	2203578	52	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	706901	32	10000	0	0	5	0	0	186	1	1
-20303004	2	0	双翼角兽	180	0	93242	93242	0	0	0	0	10000	76575	0	1	0	0	0	0	0	3	3000	2217813	53	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	28067105	34	10000	0	0	5	0	0	186	1	1
-20303005	2	0	金甲蛮狮	215	0	98746	98746	0	0	0	0	10000	78945	0	1	0	0	0	0	0	3	3000	2232048	54	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	82700734	36	10000	0	0	5	0	0	186	1	1
-20303006	2	0	麒麟瑞兽	235	0	105909	105909	0	0	0	0	10000	82457	0	1	0	0	0	0	0	3	3000	2246283	55	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	58115641	39	10000	0	0	5	0	0	186	1	1
-20303007	2	0	金色战神	265	0	111171	111171	0	0	0	0	10000	84963	0	1	0	0	0	0	0	3	3000	2260518	56	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	60633650	41	10000	0	0	5	0	0	186	1	1
+20302003	2	0	金甲蛮牛	265	0	3881	3881	0	10	0	0	0	1034	0	0	0	0	0	0	0	3	3000	1312467	34	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	7919747	0	0	0	0	1	51649324	0	1	1	1
+20302004	2	0	灵鲛斗士	275	0	4178	4178	0	11	0	0	0	1046	0	0	0	0	0	0	0	3	3000	1395030	35	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	10246409	0	0	0	0	1	59423628	0	1	1	1
+20302005	2	0	紫炎灵狮	285	0	4566	4566	0	12	0	0	0	1056	0	0	0	0	0	0	0	3	3000	1477593	36	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	14281994	0	0	0	0	1	68578949	0	1	1	1
+20302006	2	0	金甲剑士	295	0	5055	5055	0	12	0	0	0	1062	0	0	0	0	0	0	0	3	3000	1560156	37	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	17056876	0	0	0	0	1	79339802	0	1	1	1
+20302007	2	0	黄金战将	305	0	5730	5730	0	13	0	0	0	1076	0	0	0	0	0	0	0	3	3000	1642719	38	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	20770705	0	0	0	0	1	91963645	0	1	1	1
+20303001	2	0	残暴古熊王	265	0	12524	12524	0	10	0	0	10000	12683	0	1	0	0	0	0	0	3	3000	1312467	34	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	92397060	0	10000	0	0	5	0	0	186	1	1
+20303002	2	0	魅影蛛皇	275	0	14370	14370	0	11	0	0	10000	14366	0	1	0	0	0	0	0	3	3000	1395030	35	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	19541456	1	10000	0	0	5	0	0	186	1	1
+20303003	2	0	紫金貔貅	285	0	16667	16667	0	12	0	0	10000	16379	0	1	0	0	0	0	0	3	3000	1477593	36	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	66623277	1	10000	0	0	5	0	0	186	1	1
+20303004	2	0	双翼角兽	295	0	18437	18437	0	12	0	0	10000	17580	0	1	0	0	0	0	0	3	3000	1560156	37	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	98996901	1	10000	0	0	5	0	0	186	1	1
+20303005	2	0	金甲蛮狮	305	0	20827	20827	0	13	0	0	10000	19254	0	1	0	0	0	0	0	3	3000	1642719	38	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	42324900	2	10000	0	0	5	0	0	186	1	1
+20303006	2	0	麒麟瑞兽	315	0	23963	23963	0	14	0	0	10000	21264	0	1	0	0	0	0	0	3	3000	1725282	39	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	86712996	2	10000	0	0	5	0	0	186	1	1
+20303007	2	0	金色战神	325	0	25251	25251	0	15	0	0	10000	22338	0	1	0	0	0	0	0	3	3000	1807845	40	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	51812819	3	10000	0	0	5	0	0	186	1	1
 30102001	2	0	凶狼	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	0	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	1	1	1
 30102002	2	0	巨虎	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	0	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	1	1	1
 30102003	2	0	幼龙	50	0	100	100	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	100	0	0	300	2	6	10005	0	0	0	0	0	0	0	0	15	2	100	0	0	0	0	1	0	0	198	1	1

--
Gitblit v1.8.0