From af95aa29adb07dcda566256cbba880e2942dde2e Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 07 十二月 2018 14:48:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/Script/PyGameData.pyc                                           |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                  |  129 +++++++++++++------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc                |    0 
 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc                                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                             |   40 ++++----
 CoreServerGroup/GameServer/PySysDB/tagStore.txt                                            |  127 +++++++++++++------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc                 |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc               |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc                         |    0 
 11 files changed, 155 insertions(+), 141 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 391f692..250631c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -204,63 +204,70 @@
 906	30	7	0
 909	30	7	0
 1001	200	0	1
-1002	200	0	5
-1003	200	0	20
-1004	200	0	50
-1005	200	0	999
-1006	200	0	999
-1007	201	0	1
-1008	201	0	2
-1009	201	0	5
-1010	201	0	10
-1011	201	0	10
-1012	201	0	20
-1013	201	0	999
-1014	201	0	999
-1015	202	0	2
-1016	202	0	3
-1017	202	0	3
-1018	202	0	5
-1019	202	0	10
-1020	202	0	999
-1021	202	0	999
-1022	203	0	1
-1023	203	0	1
-1024	203	0	1
-1025	203	0	20
-1026	203	0	5
-1027	203	0	10
-1028	203	0	999
-1029	203	0	999
-1030	204	0	1
-1031	204	0	10
-1032	204	0	10
-1033	204	0	10
-1034	204	0	10
-1035	204	0	20
-1036	205	0	3
-1037	205	0	20
-1038	205	0	20
-1039	205	0	20
-1040	205	0	20
-1041	206	0	5
-1042	206	0	10
-1043	206	0	20
-1044	206	0	20
-1045	206	0	20
-1046	206	0	20
-1047	207	0	1
-1048	207	0	3
-1049	207	0	20
-1050	207	0	20
-1051	207	0	20
-1052	207	0	20
-1056	16	0	0
-1057	16	0	0
-1058	16	0	0
-1059	16	0	0
-1060	16	0	0
-1061	16	0	0
-1062	16	0	0
-1063	16	0	0
-1064	16	0	0
+1002	200	0	2
+1003	200	0	3
+1004	200	0	3
+1005	200	0	5
+1006	200	0	10
+1007	200	0	20
+1008	200	0	20
+1009	200	0	5
+1010	201	0	1
+1011	201	0	3
+1012	201	0	3
+1013	201	0	10
+1014	201	0	5
+1015	201	0	5
+1016	201	0	10
+1017	201	0	20
+1018	202	0	3
+1019	202	0	3
+1020	202	0	3
+1021	202	0	5
+1022	202	0	5
+1023	202	0	5
+1024	202	0	10
+1025	202	0	20
+1026	202	0	20
+1027	203	0	1
+1028	203	0	1
+1029	203	0	1
+1030	203	0	3
+1031	203	0	5
+1032	203	0	5
+1033	203	0	10
+1034	203	0	10
+1035	203	0	3
+1036	203	0	20
+1037	204	0	1
+1038	204	0	10
+1039	204	0	10
+1040	204	0	10
+1041	204	0	10
+1042	204	0	20
+1043	205	0	3
+1044	205	0	20
+1045	205	0	20
+1046	205	0	20
+1047	205	0	20
+1048	206	0	5
+1049	206	0	10
+1050	206	0	20
+1051	206	0	20
+1052	206	0	20
+1053	206	0	20
+1054	207	0	1
+1055	207	0	3
+1056	207	0	20
+1057	207	0	20
+1058	207	0	20
+1059	207	0	20
+1101	16	0	0
+1102	16	0	0
+1103	16	0	0
+1104	16	0	0
+1105	16	0	0
+1106	16	0	0
+1107	16	0	0
+1108	16	0	0
+1109	16	0	0
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 34bc4b8..6a29bfb 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index f35bab6..20152be 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 2cba7ab..723b32a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
index bf67a3b..9df362d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
index b60fb3f..2df1a2e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PetControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index d474571..5e732da 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index c48c499..00a0a83 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
index 8ef137f..b19c513 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c577ce8..474b715 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -24,28 +24,28 @@
 RuneUnlock	0|204|304|404|504|604|704|804	8_100	8_120	9	0
 RuneDoubleInlayCnt	101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9				
 RunePackageNum	200	0	0	0	0
-RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_725|2_238|3_25|4_15|5_10	0
-RuneAttr6	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_14459|2_4722|3_480|4_288|5_192	0
+RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_725|4_238|3_25|2_15|1_10	0
+RuneAttr6	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_14459|4_4722|3_480|2_288|1_192	0
 RuneAttr44	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
 RuneAttr45	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
-RuneAttr46	(level-1)*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_1200|2_600|3_300|4_180|5_120	0
+RuneAttr46	(level-1)*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_1200|4_600|3_300|2_180|1_120	0
 RuneAttr35	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
 RuneAttr36	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/3/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
-RuneAttr63	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_2800|2_1400|3_700|4_420|5_280	0
-RuneAttr64	(level-1)*500*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_3520|2_1760|3_880|4_528|5_352	0
-RuneAttr65	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_2080|2_1040|3_520|4_312|5_208	0
-RuneAttr66	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_2280|2_1140|3_570|4_342|5_228	0
-RuneAttr11	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_1240|2_620|3_310|4_186|5_124	0
-RuneAttr42	(level-1)*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1480|2_740|3_370|4_222|5_148	0
-RuneAttr41	(level-1)*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_880|2_440|3_220|4_132|5_88	0
-RuneAttr27	(level-1)*25	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_964|2_482|3_241|4_145|5_96	0
-RuneAttr8	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_623|2_270|3_104|4_63|5_42	0
-RuneAttr26	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1348|2_674|3_337|4_202|5_135	0
-RuneAttr15	(level-1)*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_520|2_260|3_130|4_78|5_52	0
-RuneAttr14	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_640|2_320|3_160|4_96|5_64	0
-RuneAttr17	(level-1)*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_440|2_220|3_110|4_66|5_44	0
-RuneAttr28	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_240|2_120|3_60|4_36|5_24	0
-RuneAttr29	(level-1)*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_280|2_140|3_70|4_42|5_28	0
+RuneAttr63	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2800|4_1400|3_700|2_420|1_280	0
+RuneAttr64	(level-1)*500*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_3520|4_1760|3_880|2_528|1_352	0
+RuneAttr65	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2080|4_1040|3_520|2_312|1_208	0
+RuneAttr66	(level-1)*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_2280|4_1140|3_570|2_342|1_228	0
+RuneAttr11	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_1240|4_620|3_310|2_186|1_124	0
+RuneAttr42	(level-1)*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_1640|4_820|3_410|2_246|1_164	0
+RuneAttr41	(level-1)*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_960|4_480|3_240|2_144|1_96	0
+RuneAttr27	(level-1)*25	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	5_964|4_482|3_241|2_145|1_96	0
+RuneAttr8	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	5_623|4_270|3_104|2_63|1_42	0
+RuneAttr26	(level-1)*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	5_1348|4_674|3_337|2_202|1_135	0
+RuneAttr15	(level-1)*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	5_520|4_260|3_130|2_78|1_52	0
+RuneAttr14	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_640|4_320|3_160|2_96|1_64	0
+RuneAttr17	(level-1)*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_440|4_220|3_110|2_66|1_44	0
+RuneAttr28	(level-1)*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_240|4_120|3_60|2_36|1_24	0
+RuneAttr29	(level-1)*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	5_280|4_140|3_70|2_42|1_28	0
 RuneExp	int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))	1_0.5|2_0.7|3_0.8|4_0.9|5_1	1.6	1_100|2_300|3_3000|4_15000|5_30000	0
 RuneMaxLV	1_10|2_20|3_30|4_40|5_50	0	0	0	0
 RuneAwardCntRate	{(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]}	{(101,1608):[(6000,0),(9000,1),(10000,2)],(1701,3208):[(6000,0),(9000,1),(10000,2)]}	0	0	0
@@ -99,11 +99,11 @@
 GodWeapon1	101|102|103	0	0	0	0
 GodWeapon2	104|105|106	0	0	0	0
 GodWeapon3	107|108|109	0	0	0	0
-GodWeapon4	110|111|112	int(50000+maxHP*proDefPer/10000.0)	0	0	0
+GodWeapon4	110|111|112	int(35469+maxHP*proDefPer/10000.0)	0	0	0
 GodWeaponActive	1	{"2":[[1,120]],  "4":[[2,120]]}	{"2":250,  "4":320}	0	0
 GodWeaponSys	{1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}				
 GodMagicExp	{"1":[10,10],"2":[10,10],"4":[10,10]}				
-MagicExterior	{"1":0,"2":0,"3":0,"4":100386}	0	500		
+MagicExterior	{"1":0,"2":0,"3":0,"4":0}	0	500		
 WorldLvExpRate	int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000)	0	0	0	0
 EquipSuitLimit	4	2	3	0	0
 EquipSuitColorStar	{"1":[4,1],"2":[5,2]}	2			
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 5a4f09d..0a2d3ee 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -203,64 +203,71 @@
 905	30	0	4739	1	1	[]	0		7	0	0	1	0	27	2000	0	0		
 906	30	0	4737	1	1	[]	0		7	0	0	1	0	27	3000	0	0		
 909	30	0	4675	1	1	[]	0		7	0	0	1	0	27	5000	0	0		
-1001	200	2	4606	3	1	[]	4606		0	0	0	1	1	1	999	3000	0	FlashRushToBuy2	FlashToSnapUp
-1002	200	2	4606	1	1	[]	4606		0	0	0	1	5	1	300	1000	0	FlashRushToBuy2	FlashToSnapUp
-1003	200	2	2213	50	1	[]	2213		0	0	0	1	20	1	150	625	0	FlashRushToBuy2	FlashToSnapUp
-1004	200	2	1503	2	1	[]	1503		0	0	0	1	50	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
-1005	200	2	4007	3	1	[]	4007		0	0	0	1	999	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
-1006	200	2	4622	5	1	[]	4622		0	0	0	1	999	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
-1007	201	2	3516	2	1	[]	3516		0	0	0	1	1	1	999	4860	0	FlashRushToBuy2	FlashToSnapUp
-1008	201	2	947	1	1	[]	947		0	0	0	1	2	1	300	1000	0	FlashRushToBuy2	FlashToSnapUp
-1009	201	2	2050	6	1	[]	2050		0	0	0	1	5	1	50	300	0	FlashRushToBuy2	FlashToSnapUp
-1010	201	2	953	1	1	[]	953		0	0	0	1	10	1	88	500	0	FlashRushToBuy2	FlashToSnapUp
-1011	201	2	4681	1	1	[]	4681		0	0	0	1	10	1	50	250	0	FlashRushToBuy2	FlashToSnapUp
-1012	201	2	4184	1	1	[]	4184		0	0	0	1	20	1	58	230	0	FlashRushToBuy2	FlashToSnapUp
-1013	201	2	4010	4	1	[]	4010		0	0	0	1	999	1	100	320	0	FlashRushToBuy2	FlashToSnapUp
-1014	201	2	4609	2	1	[]	4609		0	0	0	1	999	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
-1015	202	2	4607	2	1	[]	4607		0	0	0	1	2	1	999	4000	0	FlashRushToBuy2	FlashToSnapUp
-1016	202	2	7002	1	0	[]	7002		0	0	0	1	3	1	680	1800	0	FlashRushToBuy2	FlashToSnapUp
-1017	202	2	5006	1	1	[]	5006		0	0	0	1	3	1	20	50	0	FlashRushToBuy2	FlashToSnapUp
-1018	202	2	196	1	1	[]	196		0	0	0	1	5	1	200	800	0	FlashRushToBuy2	FlashToSnapUp
-1019	202	2	195	5	1	[]	195		0	0	0	1	10	1	300	1500	0	FlashRushToBuy2	FlashToSnapUp
-1020	202	2	4610	1	1	[]	4610		0	0	0	1	999	1	60	200	0	FlashRushToBuy2	FlashToSnapUp
-1021	202	2	5410	3	1	[]	5410		0	0	0	1	999	1	88	150	0	FlashRushToBuy2	FlashToSnapUp
-1022	203	2	5409	2	1	[]	5409		0	0	0	1	1	1	8888	25000	0	FlashRushToBuy2	FlashToSnapUp
-1023	203	2	5006	2	1	[]	5006		0	0	0	1	1	1	60	100	0	FlashRushToBuy2	FlashToSnapUp
-1024	203	2	2390	5	1	[]	2390		0	0	0	1	1	1	1800	3000	0	FlashRushToBuy2	FlashToSnapUp
-1025	203	2	4680	1	1	[]	4680		0	0	0	1	20	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
-1026	203	2	2390	1	1	[]	2390		0	0	0	1	5	1	300	600	0	FlashRushToBuy2	FlashToSnapUp
-1027	203	2	2213	100	1	[]	2213		0	0	0	1	10	1	500	1250	0	FlashRushToBuy2	FlashToSnapUp
-1028	203	2	4608	2	1	[]	4608		0	0	0	1	999	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
-1029	203	2	198	3	1	[]	198		0	0	0	1	999	1	88	900	0	FlashRushToBuy2	FlashToSnapUp
-1030	204	2	4607	2	1	[]	4607		0	0	0	1	1	1	666	4000	0	FlashRushToBuy2	FlashToSnapUp
-1031	204	2	2213	50	1	[]	2213		0	0	0	1	10	1	180	750	0	FlashRushToBuy2	FlashToSnapUp
-1032	204	2	4306	1000	1	[]	4306		0	0	0	1	10	1	280	1000	0	FlashRushToBuy2	FlashToSnapUp
-1033	204	2	4681	1	1	[]	4681		0	0	0	1	10	1	66	250	0	FlashRushToBuy2	FlashToSnapUp
-1034	204	2	4680	1	1	[]	4680		0	0	0	1	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
-1035	204	2	4007	3	1	[]	4007		0	0	0	1	20	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
-1036	205	2	3516	2	1	[]	3516		0	0	0	1	3	1	888	4860	0	FlashRushToBuy2	FlashToSnapUp
-1037	205	2	4010	4	1	[]	4010		0	0	0	1	20	1	88	320	0	FlashRushToBuy2	FlashToSnapUp
-1038	205	2	1503	2	1	[]	1503		0	0	0	1	20	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
-1039	205	2	4609	2	1	[]	4609		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
-1040	205	2	4610	1	1	[]	4610		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
-1041	206	2	4606	2	1	[]	4606		0	0	0	1	5	1	388	2000	0	FlashRushToBuy2	FlashToSnapUp
-1042	206	2	4608	2	1	[]	4608		0	0	0	1	10	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
-1043	206	2	4622	5	1	[]	4622		0	0	0	1	20	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
-1044	206	2	983	20	1	[]	983		0	0	0	1	20	1	188	600	0	FlashRushToBuy2	FlashToSnapUp
-1045	206	2	2213	20	1	[]	2213		0	0	0	1	20	1	66	300	0	FlashRushToBuy2	FlashToSnapUp
-1046	206	2	144	100	1	[]	144		0	0	0	1	20	1	66	300	0	FlashRushToBuy2	FlashToSnapUp
-1047	207	2	5409	2	1	[]	5409		0	0	0	1	1	1	8888	25000	0	FlashRushToBuy2	FlashToSnapUp
-1048	207	2	2389	5	1	[]	2389		0	0	0	1	3	1	388	900	0	FlashRushToBuy2	FlashToSnapUp
-1049	207	2	198	3	1	[]	198		0	0	0	1	20	1	88	900	0	FlashRushToBuy2	FlashToSnapUp
-1050	207	2	195	5	1	[]	195		0	0	0	1	20	1	288	1500	0	FlashRushToBuy2	FlashToSnapUp
-1051	207	2	5410	3	1	[]	5410		0	0	0	1	20	1	88	150	0	FlashRushToBuy2	FlashToSnapUp
-1052	207	2	5411	3	1	[]	5411		0	0	0	1	20	1	188	300	0	FlashRushToBuy2	FlashToSnapUp
-1056	16	0	3513	1	1	[[3503,1,1]]	4681		0	0	58	1	0	1	18	180	86400		
-1057	16	0	4151	20	1	[]	4151		0	0	65	1	0	1	18	200	86400		
-1058	16	0	181	20	1	[]	181		0	0	80	1	0	1	18	200	86400		
-1059	16	0	101	50	1	[]	101		0	0	110	1	0	1	18	100	86400		
-1060	16	0	4304	30	1	[]	4304		0	0	115	1	0	1	18	150	86400		
-1061	16	0	142	100	1	[[29,5000000,1]]	142		0	0	155	1	0	1	18	175	86400		
-1062	16	0	5303	200	1	[[5412,5,1]]	5303		0	0	180	1	0	1	28	225	86400		
-1063	16	0	2205	1	1	[]	2205		0	0	200	1	0	1	18	200	86400		
-1064	16	0	2389	1	1	[]	2389		0	0	260	1	0	1	28	180	86400		
+1001	200	2	4606	3	1	[]	4606		0	0	0	1	1	1	800	3000	0	FlashRushToBuy2	FlashToSnapUp
+1002	200	2	2213	60	1	[]	2213		0	0	0	1	2	1	150	750	0	FlashRushToBuy2	FlashToSnapUp
+1003	200	2	1503	2	1	[]	1503		0	0	0	1	3	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
+1004	200	2	4606	1	1	[]	4606		0	0	0	1	3	1	300	1000	0	FlashRushToBuy2	FlashToSnapUp
+1005	200	2	4007	3	1	[]	4007		0	0	0	1	5	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1006	200	2	4622	5	1	[]	4622		0	0	0	1	10	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
+1007	200	2	4151	25	1	[]	4151		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1008	200	2	4304	50	1	[]	4304		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1009	200	2	5410	3	1	[]	5410		0	0	0	1	5	1	68	150	0	FlashRushToBuy2	FlashToSnapUp
+1010	201	2	3516	2	1	[]	3516		0	0	0	1	1	1	999	4860	0	FlashRushToBuy2	FlashToSnapUp
+1011	201	2	4010	5	1	[]	4010		0	0	0	1	3	1	80	400	0	FlashRushToBuy2	FlashToSnapUp
+1012	201	2	4184	1	1	[]	4184		0	0	0	1	3	1	50	230	0	FlashRushToBuy2	FlashToSnapUp
+1013	201	2	4609	2	1	[]	4609		0	0	0	1	10	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1014	201	2	4681	1	1	[]	4681		0	0	0	1	5	1	50	250	0	FlashRushToBuy2	FlashToSnapUp
+1015	201	2	2050	6	1	[]	2050		0	0	0	1	5	1	50	300	0	FlashRushToBuy2	FlashToSnapUp
+1016	201	2	953	1	1	[]	953		0	0	0	1	10	1	88	500	0	FlashRushToBuy2	FlashToSnapUp
+1017	201	2	181	25	1	[]	181		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1018	202	2	7002	1	0	[]	7002		0	0	0	1	3	1	680	1800	0	FlashRushToBuy2	FlashToSnapUp
+1019	202	2	5006	2	1	[]	5006		0	0	0	1	3	1	50	100	0	FlashRushToBuy2	FlashToSnapUp
+1020	202	2	196	1	1	[]	196		0	0	0	1	3	1	200	930	0	FlashRushToBuy2	FlashToSnapUp
+1021	202	2	195	5	1	[]	195		0	0	0	1	5	1	300	1500	0	FlashRushToBuy2	FlashToSnapUp
+1022	202	2	4610	1	1	[]	4610		0	0	0	1	5	1	60	200	0	FlashRushToBuy2	FlashToSnapUp
+1023	202	2	5410	3	1	[]	5410		0	0	0	1	5	1	68	150	0	FlashRushToBuy2	FlashToSnapUp
+1024	202	2	3514	2	1	[]	3514		0	0	0	1	10	1	188	540	0	FlashRushToBuy2	FlashToSnapUp
+1025	202	2	4151	25	1	[]	4151		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1026	202	2	4304	50	1	[]	4304		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1027	203	2	5409	2	1	[]	5409		0	0	0	1	1	1	8888	25000	0	FlashRushToBuy2	FlashToSnapUp
+1028	203	2	5006	2	1	[]	5006		0	0	0	1	1	1	50	100	0	FlashRushToBuy2	FlashToSnapUp
+1029	203	2	2390	5	1	[]	2390		0	0	0	1	1	1	1800	3000	0	FlashRushToBuy2	FlashToSnapUp
+1030	203	2	2390	1	1	[]	2390		0	0	0	1	3	1	300	600	0	FlashRushToBuy2	FlashToSnapUp
+1031	203	2	2213	120	1	[]	2213		0	0	0	1	5	1	500	1500	0	FlashRushToBuy2	FlashToSnapUp
+1032	203	2	198	3	1	[]	198		0	0	0	1	5	1	88	900	0	FlashRushToBuy2	FlashToSnapUp
+1033	203	2	4680	1	1	[]	4680		0	0	0	1	10	1	200	750	0	FlashRushToBuy2	FlashToSnapUp
+1034	203	2	4608	2	1	[]	4608		0	0	0	1	10	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
+1035	203	2	4010	5	1	[]	4010		0	0	0	1	3	1	80	400	0	FlashRushToBuy2	FlashToSnapUp
+1036	203	2	181	25	1	[]	181		0	0	0	1	20	1	88	250	0	FlashRushToBuy2	FlashToSnapUp
+1037	204	2	4607	2	1	[]	4607		0	0	0	1	1	1	666	4000	0	FlashRushToBuy2	FlashToSnapUp
+1038	204	2	2213	50	1	[]	2213		0	0	0	1	10	1	180	750	0	FlashRushToBuy2	FlashToSnapUp
+1039	204	2	4306	1000	1	[]	4306		0	0	0	1	10	1	280	1000	0	FlashRushToBuy2	FlashToSnapUp
+1040	204	2	4681	1	1	[]	4681		0	0	0	1	10	1	66	250	0	FlashRushToBuy2	FlashToSnapUp
+1041	204	2	4680	1	1	[]	4680		0	0	0	1	10	1	188	750	0	FlashRushToBuy2	FlashToSnapUp
+1042	204	2	4007	3	1	[]	4007		0	0	0	1	20	1	60	240	0	FlashRushToBuy2	FlashToSnapUp
+1043	205	2	3516	2	1	[]	3516		0	0	0	1	3	1	888	4860	0	FlashRushToBuy2	FlashToSnapUp
+1044	205	2	4010	4	1	[]	4010		0	0	0	1	20	1	88	320	0	FlashRushToBuy2	FlashToSnapUp
+1045	205	2	1503	2	1	[]	1503		0	0	0	1	20	1	20	100	0	FlashRushToBuy2	FlashToSnapUp
+1046	205	2	4609	2	1	[]	4609		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1047	205	2	4610	1	1	[]	4610		0	0	0	1	20	1	50	200	0	FlashRushToBuy2	FlashToSnapUp
+1048	206	2	4606	2	1	[]	4606		0	0	0	1	5	1	388	2000	0	FlashRushToBuy2	FlashToSnapUp
+1049	206	2	4608	2	1	[]	4608		0	0	0	1	10	1	200	1000	0	FlashRushToBuy2	FlashToSnapUp
+1050	206	2	4622	5	1	[]	4622		0	0	0	1	20	1	88	400	0	FlashRushToBuy2	FlashToSnapUp
+1051	206	2	983	20	1	[]	983		0	0	0	1	20	1	188	600	0	FlashRushToBuy2	FlashToSnapUp
+1052	206	2	2213	20	1	[]	2213		0	0	0	1	20	1	66	300	0	FlashRushToBuy2	FlashToSnapUp
+1053	206	2	144	100	1	[]	144		0	0	0	1	20	1	66	300	0	FlashRushToBuy2	FlashToSnapUp
+1054	207	2	5409	2	1	[]	5409		0	0	0	1	1	1	8888	25000	0	FlashRushToBuy2	FlashToSnapUp
+1055	207	2	2389	5	1	[]	2389		0	0	0	1	3	1	388	900	0	FlashRushToBuy2	FlashToSnapUp
+1056	207	2	198	3	1	[]	198		0	0	0	1	20	1	88	900	0	FlashRushToBuy2	FlashToSnapUp
+1057	207	2	195	5	1	[]	195		0	0	0	1	20	1	288	1500	0	FlashRushToBuy2	FlashToSnapUp
+1058	207	2	5410	3	1	[]	5410		0	0	0	1	20	1	88	150	0	FlashRushToBuy2	FlashToSnapUp
+1059	207	2	5411	3	1	[]	5411		0	0	0	1	20	1	188	300	0	FlashRushToBuy2	FlashToSnapUp
+1101	16	0	3513	1	1	[[3503,1,1]]	4681		0	0	58	1	0	1	18	180	86400		
+1102	16	0	4151	20	1	[]	4151		0	0	65	1	0	1	18	200	86400		
+1103	16	0	181	20	1	[]	181		0	0	80	1	0	1	18	200	86400		
+1104	16	0	101	50	1	[]	101		0	0	110	1	0	1	18	100	86400		
+1105	16	0	4304	30	1	[]	4304		0	0	115	1	0	1	18	150	86400		
+1106	16	0	142	100	1	[[29,5000000,1]]	142		0	0	155	1	0	1	18	175	86400		
+1107	16	0	5303	200	1	[[5412,5,1]]	5303		0	0	180	1	0	1	28	225	86400		
+1108	16	0	2205	1	1	[]	2205		0	0	200	1	0	1	18	200	86400		
+1109	16	0	2389	1	1	[]	2389		0	0	260	1	0	1	28	180	86400		

--
Gitblit v1.8.0