From cd685bb6e91b6ff478352b8f892649cbcc15a2e5 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期三, 16 一月 2019 21:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt                                                   |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc                              |    0 
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                                           |    4 +-
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                 |    2 +
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                                                    |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc |    0 
 CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt                                                 |    2 
 db/PyMongoDataServer/PySysDB/tagChests.txt                                                                 |    2 +
 db/PyMongoDataServer/PySysDB/tagActWishingWell.txt                                                         |    2 
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                                            |    2 +
 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt                                                               |   58 ++++++++++++++++------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc                                 |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                                  |   16 ++++----
 14 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index b2f1eff..cb2fa70 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,4 +1,4 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV
 1	test1	[]	[]	2019-1-1	2019-1-1	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
 2	test2	[]	[]	7	7	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
-3	20190122	[]	[]	2019-1-12	2019-1-12	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
+3	20190122	[]	[]	2019-1-22	2019-1-22	2	{0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]}	{-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]}	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index d1dc0ee..72e8fd2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,4 +1,4 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV	LimitPoint
 1	opensever	[]	[]	6	7	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
 2	Jan01	[]	[]	2019-1-3	2019-1-4	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
-3	20190120	[]	[]	2019-1-20	2019-1-20	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
+3	20190120	[]	[]	2019-1-20	2019-1-21	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index e8e65b0..1b6b317 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -18,4 +18,4 @@
 17	sdq0108	[]	[]	2019-1-8	2019-1-8	1	0	{0:["XYCOpen", []]}	{}	[]	110
 18	20190110	[]	[]	2019-1-10	2019-1-10	1	0	{0:["XYCOpen", []]}	{}	[]	110
 19	20190114	[]	[]	2019-1-14	2019-1-14	1	0	{0:["XYCOpen", []]}	{}	[]	110
-20	20190117	[]	[]	2019-1-17	2019-1-19	1	0	{0:["XYCOpen", []]}	{}	[]	110
+20	20190117	[]	[]	2019-1-17	2019-1-18	1	0	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 6a5557d..7aecc5b 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/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
index d4876b4..4e0d0c1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index 07503c6..bb22eda 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 865dbad..76e1fac 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index cd7340c..2b38404 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -18,4 +18,4 @@
 17	2019-1-8	2019-1-8	1	0	110	1
 18	2019-1-10	2019-1-10	1	0	110	1
 19	2019-1-14	2019-1-14	1	0	110	1
-20	2019-1-17	2019-1-19	1	0	110	1
+20	2019-1-17	2019-1-18	1	0	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 974b495..d6245ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -231,3 +231,5 @@
 2439	0	0	0	0	1
 2440	0	0	400	1	1
 2441	0	0	0	0	0
+2442	0	0	0	1	1
+2443	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 9ffac4b..1e9229e 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -228,3 +228,5 @@
 2439		8209_1|8222_1|8235_1|8248_1|8261_1										[8209,8222,8235,8248,8261]
 2440			2439_1									[2439]
 2441			5806_1|5807_1|5808_1									
+2442				[[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]]	1							
+2443		7205_1|7210_1|7215_1|7220_1|7225_1|7230_1|7235_1|7240_1|7245_1|7250_1|7255_1|7260_1										
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 1c508c2..3a399ff 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -60,5 +60,5 @@
 4	59	131	1	[(4606,1,1),(2213,25,1)]	4606	LimitGift3
 4	60	125	1	[(4680,1,1),(4681,2,1)]	4680	LimitGift3
 4	61	130	1	[(913,1,1),(4694,8,1)]	913	LimitGift3
-8	62	440	1	[(4223,1,1),(4151,25,1)]	262	LimitGift3
-4	63	108	1	[(110,60,1),(112,12,1)]	913	LimitGift3
+8	62	440	1	[(4223,1,1),(4151,25,1)]	4223	LimitGift3
+4	63	108	1	[(110,60,1),(112,12,1)]	112	LimitGift3
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index fb5d472..38044b9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -639,6 +639,8 @@
 2439	1	0	神兽橙装自选箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2440	1	0	神兽超值宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2441	1	0	夏日时装礼盒	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2442	1	0	橙色随机宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2443	1	0	红色选择宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	1	1	3502	6	600	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	2	3503	6	840	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3503	1	0	3级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	1	3	3504	6	1080	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 14a7d68..4938b33 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -1177,14 +1177,14 @@
 40102005	2	0	亚种雷兽	435	0	28866	28866	0	15	0	0	0	7467	0	0	0	0	0	0	0	3	3000	1611629	130	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	12026311	1	0	0	0	1	602510	38	1	1	1
 40102006	2	0	金甲剑士	455	0	31450	31450	0	16	0	0	0	8115	0	0	0	0	0	0	0	3	3000	1671530	135	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	25170648	1	0	0	0	1	809985	22	1	1	1
 40102007	2	0	黄金战将	475	0	34527	34527	0	17	0	0	0	9152	0	0	0	0	0	0	0	3	3000	1761976	143	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	43922990	1	0	0	0	1	1036030	25	1	1	1
-40103001	2	0	仙境巨兽	340	0	57320	57320	0	16	0	0	0	33583	0	1	0	0	0	0	0	3	3000	1221071	97	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	55040949	6	10000	0	0	5	0	0	186	1	1
-40103002	2	0	丛林祭祀	365	0	75887	75887	0	18	0	0	0	46447	0	1	0	0	0	0	0	3	3000	1315440	105	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	24190121	11	10000	0	0	5	0	0	186	1	1
-40103003	2	0	秘境之吻	390	0	89188	89188	0	20	0	0	0	59936	0	1	0	0	0	0	0	3	3000	1412339	113	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	14948985	16	10000	0	0	5	0	0	186	1	1
-40103004	2	0	仙湖守卫	415	0	103221	103221	0	21	0	0	0	71699	0	1	0	0	0	0	0	3	3000	1524473	122	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	52453869	21	10000	0	0	5	0	0	186	1	1
-40103005	2	0	湖中之灵	440	0	116322	116322	0	22	0	0	0	96116	0	1	0	0	0	0	0	3	3000	1627066	131	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	81766261	39	10000	0	0	5	0	0	186	1	1
-40103006	2	0	岩石守卫	460	0	130917	130917	0	23	0	0	0	108400	0	1	0	0	0	0	0	3	3000	1716500	139	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	21780944	48	10000	0	0	5	0	0	186	1	1
-40103007	2	0	裂空魅影	480	0	141805	141805	0	25	0	0	0	119391	0	1	0	0	0	0	0	3	3000	1793610	145	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	64503114	70	10000	0	0	5	0	0	186	1	1
-40103008	2	0	秘境勇士	500	0	145826	145826	0	27	0	0	0	125337	0	1	0	0	0	0	0	3	3000	1886586	153	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	69841625	88	10000	0	0	5	0	0	186	1	1
+40103001	2	0	仙境巨兽	340	0	56396	56396	0	16	0	0	0	32984	0	1	0	0	0	0	0	3	3000	1221071	97	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	87917251	5	10000	0	0	5	0	0	186	1	1
+40103002	2	0	丛林祭祀	365	0	74482	74482	0	18	0	0	0	45536	0	1	0	0	0	0	0	3	3000	1315440	105	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	99656874	10	10000	0	0	5	0	0	186	1	1
+40103003	2	0	秘境之吻	390	0	106794	106794	0	20	0	0	0	58733	0	1	0	0	0	0	0	3	3000	1412339	113	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	29844887	15	10000	0	0	5	0	0	186	1	1
+40103004	2	0	仙湖守卫	415	0	135417	135417	0	21	0	0	0	70194	0	1	0	0	0	0	0	3	3000	1524473	122	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	75172685	20	10000	0	0	5	0	0	186	1	1
+40103005	2	0	湖中之灵	440	0	152692	152692	0	22	0	0	0	94489	0	1	0	0	0	0	0	3	3000	1627066	131	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	13017273	40	10000	0	0	5	0	0	186	1	1
+40103006	2	0	岩石守卫	460	0	173996	173996	0	23	0	0	0	107580	0	1	0	0	0	0	0	3	3000	1716500	139	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	1319509	51	10000	0	0	5	0	0	186	1	1
+40103007	2	0	裂空魅影	480	0	190250	190250	0	25	0	0	0	119283	0	1	0	0	0	0	0	3	3000	1793610	145	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	86156989	76	10000	0	0	5	0	0	186	1	1
+40103008	2	0	秘境勇士	500	0	196272	196272	0	27	0	0	0	125896	0	1	0	0	0	0	0	3	3000	1886586	153	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	62304117	97	10000	0	0	5	0	0	186	1	1
 50103001	2	0	道士鼠	1	0	1184	1184	0	2	0	0	10000	1430	0	7	0	0	0	0	0	5	3000	453622	18	0	300	2	6	23010	23072	0	0	0	0	0	0	0	10	2	1742024	0	0	0	0	5	0	0	186	1	1
 50103002	2	0	觉灵鹿	1	0	2863	2863	0	3	0	0	10000	4148	0	7	0	0	0	0	0	5	3000	556113	20	0	300	2	6	23010	23068	0	0	0	0	0	0	0	10	2	5087089	0	0	0	0	5	0	0	186	1	1
 50103003	2	0	球球	1	0	3046	3046	0	4	0	0	10000	4235	0	7	0	0	0	0	0	5	3000	634880	22	0	300	2	6	23010	23074	0	0	0	0	0	0	0	10	2	7079698	0	0	0	0	5	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index 1aad447..8e79c76 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -638,7 +638,7 @@
 777	0	31220	0	[113,131,1,15]	1	1	0	0	0	0	1		5	5	0	103
 1060	30909005	31220	0	[58,17,1,15]	1	1	0	0	0	0	1		5	5	0	0
 90380	0	21110	0	[82,85,0,15]	1	1	0	0	0	0	1		5	5	0	102
-114175	40102003	32020	0	[193,267,8,15]	2	1	0	300000	0	0	1		5	5	0	0
+114283	0	32020	0	[96,315,0,15]	1	1	0	0	0	0	1		5	5	0	133
 77004	10401003	10040	0	[195,85,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 18955	10701004	10070	0	[76,99,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 18957	10701004	10070	0	[61,100,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -944,7 +944,7 @@
 105433	11001003	10100	0	[116,91,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105443	11001004	10100	0	[113,119,1,12]	1	1	0	2500	0	0	1		5	5	0	0
 114139	0	32020	0	[96,246,0,15]	1	1	0	0	0	0	1		5	5	0	106
-114145	0	32020	0	[217,316,0,15]	1	1	0	0	0	0	1		5	5	0	101
+114141	0	32020	0	[146,329,0,15]	1	1	0	0	0	0	1		5	5	0	111
 105453	11001004	10100	0	[105,121,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105455	11001004	10100	0	[107,122,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105457	11001004	10100	0	[108,120,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -980,6 +980,27 @@
 92486	0	21110	0	[103,98,0,15]	1	1	0	0	0	0	1		5	5	0	118
 92489	0	21110	0	[100,66,0,9]	1	1	0	0	0	0	1		5	5	0	121
 104832	0	21110	0	[122,30,0,15]	1	1	0	0	0	0	1		5	5	0	126
+114145	0	32020	0	[217,316,0,15]	1	1	0	0	0	0	1		5	5	0	101
+114279	0	32020	0	[215,149,0,15]	1	1	0	0	0	0	1		5	5	0	129
+114280	0	32020	0	[180,296,0,15]	1	1	0	0	0	0	1		5	5	0	130
+114281	0	32020	0	[123,294,0,15]	1	1	0	0	0	0	1		5	5	0	131
+114282	0	32020	0	[204,258,0,15]	1	1	0	0	0	0	1		5	5	0	132
+114149	0	32020	0	[206,143,0,15]	1	1	0	0	0	0	1		5	5	0	108
+114151	0	32020	0	[153,315,0,15]	1	1	0	0	0	0	1		5	5	0	102
+114153	0	32020	0	[93,293,0,15]	1	1	0	0	0	0	1		5	5	0	103
+114155	0	32020	0	[169,249,0,15]	1	1	0	0	0	0	1		5	5	0	105
+114157	0	32020	0	[213,281,0,15]	1	1	0	0	0	0	1		5	5	0	104
+114159	0	32020	0	[67,253,0,15]	1	1	0	0	0	0	1		5	5	0	113
+114163	40102001	32020	0	[160,333,6,15]	8	8	0	300000	0	0	1		5	5	0	0
+114165	40102002	32020	0	[105,332,7,15]	8	8	0	300000	0	0	1		5	5	0	0
+114175	40102003	32020	0	[193,267,8,15]	2	1	0	300000	0	0	1		5	5	0	0
+114183	40102005	32020	0	[78,262,7,15]	8	8	0	300000	0	0	1		5	5	0	0
+114191	0	32020	0	[127,282,0,15]	1	1	0	0	0	0	1		5	5	0	110
+114193	0	32020	0	[97,274,0,15]	1	1	0	0	0	0	1		5	5	0	115
+114195	0	32020	0	[85,251,0,15]	1	1	0	0	0	0	1		5	5	0	116
+114197	0	32020	0	[152,274,0,15]	1	1	0	0	0	0	1		5	5	0	117
+114199	0	32020	0	[181,276,0,15]	1	1	0	0	0	0	1		5	5	0	119
+114201	0	32020	0	[193,306,0,15]	1	1	0	0	0	0	1		5	5	0	118
 114067	0	32020	0	[218,326,0,12]	1	1	0	0	0	0	1		5	5	0	180
 114069	0	32020	0	[165,303,0,16]	1	1	0	0	0	0	1		5	5	0	184
 114071	0	32020	0	[103,303,0,17]	1	1	0	0	0	0	1		5	5	0	185
@@ -1005,13 +1026,6 @@
 90351	10804014	10080	0	[124,61,0,15]	1	1	0	0	0	0	1		5	5	160	0
 90352	10804015	10080	0	[127,65,0,15]	1	1	0	0	0	0	1		5	5	160	0
 99710	0	10080	0	[63,61,0,10]	1	1	0	2500	0	0	1		5	5	0	99
-114183	40102005	32020	0	[78,262,7,15]	8	8	0	300000	0	0	1		5	5	0	0
-114191	0	32020	0	[127,282,0,15]	1	1	0	0	0	0	1		5	5	0	110
-114193	0	32020	0	[97,274,0,15]	1	1	0	0	0	0	1		5	5	0	115
-114195	0	32020	0	[85,251,0,15]	1	1	0	0	0	0	1		5	5	0	116
-114197	0	32020	0	[152,274,0,15]	1	1	0	0	0	0	1		5	5	0	117
-114199	0	32020	0	[181,276,0,15]	1	1	0	0	0	0	1		5	5	0	119
-114201	0	32020	0	[193,306,0,15]	1	1	0	0	0	0	1		5	5	0	118
 80197	10901002	10090	0	[105,18,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80198	10901002	10090	0	[102,17,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80199	10901002	10090	0	[110,32,0,15]	1	1	0	3000	0	0	1		5	5	0	0
@@ -1133,11 +1147,6 @@
 76613	10301005	10030	0	[66,122,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76625	10301001	10030	0	[67,12,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 80303	10901005	10090	0	[61,123,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-114203	0	32020	0	[198,241,0,15]	1	1	0	0	0	0	1		5	5	0	120
-114205	0	32020	0	[192,210,0,15]	1	1	0	0	0	0	1		5	5	0	121
-114207	0	32020	0	[210,179,0,15]	1	1	0	0	0	0	1		5	5	0	122
-114209	0	32020	0	[135,307,0,15]	1	1	0	0	0	0	1		5	5	0	123
-114211	0	32020	0	[185,334,0,15]	1	1	0	0	0	0	1		5	5	0	124
 76635	10301005	10030	0	[58,125,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76647	10303001	10030	0	[20,160,1,12]	1	1	0	10000	0	0	1		5	5	128	0
 104851	0	21110	0	[8,82,0,15]	1	1	0	0	0	0	1		5	5	0	145
@@ -1436,7 +1445,7 @@
 105365	11001002	10100	0	[106,53,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 89940	11101005	10110	0	[26,66,1,15]	1	1	0	3000	0	0	1		5	5	0	0
 89942	11101005	10110	0	[29,67,1,15]	1	1	0	3000	0	0	1		5	5	0	0
-114213	0	32020	0	[117,327,0,15]	1	1	0	0	0	0	1		5	5	0	125
+114147	0	32020	0	[233,218,0,15]	1	1	0	0	0	0	1		5	5	0	107
 92478	0	21110	0	[23,81,0,15]	1	1	0	0	0	0	1		5	5	0	110
 92479	0	21110	0	[24,103,0,15]	1	1	0	0	0	0	1		5	5	0	111
 92480	0	21110	0	[25,130,0,15]	1	1	0	0	0	0	1		5	5	0	112
@@ -1444,14 +1453,6 @@
 92482	0	21110	0	[43,145,0,15]	1	1	0	0	0	0	1		5	5	0	114
 92483	0	21110	0	[54,133,0,15]	1	1	0	0	0	0	1		5	5	0	115
 92484	0	21110	0	[55,126,0,15]	1	1	0	0	0	0	1		5	5	0	116
-114147	0	32020	0	[233,218,0,15]	1	1	0	0	0	0	1		5	5	0	107
-114149	0	32020	0	[206,143,0,15]	1	1	0	0	0	0	1		5	5	0	108
-114151	0	32020	0	[153,315,0,15]	1	1	0	0	0	0	1		5	5	0	102
-114153	0	32020	0	[93,293,0,15]	1	1	0	0	0	0	1		5	5	0	103
-114155	0	32020	0	[169,249,0,15]	1	1	0	0	0	0	1		5	5	0	105
-114157	0	32020	0	[213,281,0,15]	1	1	0	0	0	0	1		5	5	0	104
-114159	0	32020	0	[67,253,0,15]	1	1	0	0	0	0	1		5	5	0	113
-114163	40102001	32020	0	[160,333,6,15]	8	8	0	300000	0	0	1		5	5	0	0
 76319	10201001	10020	0	[187,23,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76321	10201003	10020	0	[148,70,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76323	10201005	10020	0	[116,144,1,15]	1	1	0	1800	0	0	1		5	5	0	0
@@ -2076,7 +2077,14 @@
 27712	10604008	10060	0	[21,63,0,15]	1	1	0	0	0	0	1		5	5	100	0
 27714	10604010	10060	0	[31,119,0,15]	1	1	0	0	0	0	1		5	5	113	0
 27716	10604003	10060	0	[72,19,0,15]	1	1	0	0	0	0	1		5	5	80	0
-114165	40102002	32020	0	[105,332,7,15]	8	8	0	300000	0	0	1		5	5	0	0
+114205	0	32020	0	[192,210,0,15]	1	1	0	0	0	0	1		5	5	0	121
+114207	0	32020	0	[210,179,0,15]	1	1	0	0	0	0	1		5	5	0	122
+114209	0	32020	0	[135,307,0,15]	1	1	0	0	0	0	1		5	5	0	123
+114211	0	32020	0	[185,334,0,15]	1	1	0	0	0	0	1		5	5	0	124
+114213	0	32020	0	[117,327,0,15]	1	1	0	0	0	0	1		5	5	0	125
+114250	0	32020	0	[128,334,0,15]	1	1	0	0	0	0	1		5	5	0	126
+114251	0	32020	0	[203,348,0,15]	1	1	0	0	0	0	1		5	5	0	127
+114252	0	32020	0	[126,261,0,15]	1	1	0	0	0	0	1		5	5	0	128
 76013	10204007	10020	0	[161,81,0,1]	1	1	0	0	0	0	1		5	5	131	0
 105381	11001002	10100	0	[112,42,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105383	11001002	10100	0	[114,45,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -2117,7 +2125,7 @@
 68341	0	31110	0	[52,13,1,15]	1	1	0	0	0	0	1		5	5	0	102
 68385	0	51010	0	[66,118,2,50]	1	1	0	0	0	0	1		5	5	0	115
 76535	10301004	10030	0	[103,114,1,16]	1	1	0	1800	0	0	1		5	5	0	0
-114141	0	32020	0	[146,329,0,15]	1	1	0	0	0	0	1		5	5	0	111
+114203	0	32020	0	[198,241,0,15]	1	1	0	0	0	0	1		5	5	0	120
 76509	10302001	10030	0	[21,108,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76511	10301003	10030	0	[100,63,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76513	10301001	10030	0	[51,22,1,15]	1	1	0	1800	0	0	1		5	5	0	0

--
Gitblit v1.8.0