From c609e867544651734c84b69f4d4a81406c4ba1e3 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 13 八月 2018 15:36:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagDailyAction.txt                                 |    2 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                       |    4 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc             |    0 
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                           |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                      |   34 ++++++++--------
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                       |   46 +++++++++++-----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc |    0 
 8 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index fb2b258..889fc01 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 58ad3c2..1b715ee 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 034d931..a96d1e1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
index 13a6584..1e6acc8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
index 569b017..1070af9 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
@@ -6,7 +6,7 @@
 5	0	0	0	0
 6	999	2	0	0
 7	10	2	0	0
-8	2	2	0	0
+8	1	2	0	0
 9	3	2	0	0
 10	8	2	0	0
 11	1	2	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 3cec1d4..447d96e 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -153,7 +153,7 @@
 901	30	0	2322	1	1	[]	0		7	0	0	0	27	50	0	0	
 902	30	0	4658	1	1	[]	0		7	0	0	2	27	500	0	0	
 903	30	0	4738	1	1	[]	0		7	0	0	3	27	800	0	0	
-904	30	0	4739	1	1	[]	0		7	0	0	1	27	1000	0	0	
-905	30	0	4735	1	1	[]	0		7	0	0	1	27	2000	0	0	
+904	30	0	4735	1	1	[]	0		7	0	0	1	27	1000	0	0	
+905	30	0	4739	1	1	[]	0		7	0	0	1	27	2000	0	0	
 906	30	0	4737	1	1	[]	0		7	0	0	1	27	3000	0	0	
 909	30	0	4675	1	1	[]	0		7	0	0	1	27	5000	0	0	
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 6d5a3fa..afe29b1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -457,28 +457,28 @@
 3518	1	0	8级攻击炎晶	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	100	0	0	0	1	225	2	8	0	7	2000	0	0	13	1300	0	0	12	150	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
 3710	5	0	雄鹰之羽	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	2000	0	0	19	1500	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	1	0	0	0	0	3	0	0	0	0	0	0	3600	0	0	0	0	0	0	0
 3711	5	0	雄鹰之羽	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	50000	0	0	19	800	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3712	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	560	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	5	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3713	8	0	魔龙之魂	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1680	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	12	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3714	10	0	枪系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	6720	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3715	12	0	枪系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	33600	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	21	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3712	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	5	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3713	8	0	魔龙之魂	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	13500	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	12	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3714	10	0	枪系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3715	12	0	枪系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	83500	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	21	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3720	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	2000	0	0	19	1500	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	1	0	0	0	0	3	0	0	0	0	0	0	3600	0	0	0	0	0	0	0
 3721	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	50000	0	0	19	800	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3722	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	560	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	5	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3723	8	0	百鸟朝凤	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1680	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	12	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3724	10	0	杖系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	6720	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3725	12	0	杖系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	33600	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	21	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3794	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	560	0	10	0	0	0	0	6	100000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3795	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	10	0	0	0	0	6	100000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3722	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	5	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3723	8	0	百鸟朝凤	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	13500	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	12	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3724	10	0	杖系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3725	12	0	杖系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	83500	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	21	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3794	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	100000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3795	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	100000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3796	5	0	雄鹰之羽	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	70000	0	0	19	1300	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3797	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	70000	0	0	19	1300	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3798	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	560	0	10	0	0	0	0	220	3795	0	0	0	0	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3799	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	560	0	10	0	0	0	0	220	3794	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3798	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	220	3795	0	0	0	0	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3799	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	220	3794	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3801	5	0	青鸾之羽	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	10	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	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3802	6	0	火凤精血	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	500	0	20	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	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3803	8	0	神凰冠羽	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1000	0	50	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	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3804	10	0	翅膀4代材料	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	3360	0	20	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3805	12	0	翅膀5代材料1	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	16800	0	50	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3806	12	0	翅膀5代材料2	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	16800	0	50	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3802	6	0	火凤精血	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	3750	0	20	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	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3803	8	0	神凰冠羽	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	8100	0	50	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	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3804	10	0	翅膀4代材料	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	12250	0	20	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3805	12	0	翅膀5代材料1	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	41750	0	50	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3806	12	0	翅膀5代材料2	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	41750	0	50	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	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3807	1	0	初级翅膀精炼石	52	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	50	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
 3808	1	0	高级翅膀精炼石	52	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	1000	0	50	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
 3901	1	0	仙盟兽粮	50	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	5	0	0	0	0	0	100	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	1	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 d7c7a21..c13ddfb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -543,7 +543,7 @@
 31103007	2	0	浴火麒麟	200	0	1964	1964	0	0	0	0	90000	5361	0	0	0	0	0	0	0	0	2600	35250	33	0	300	2	5	10068	10069	10070	10207	0	0	0	0	0	40	2	3839680	0	0	0	0	3	0	0	186	1	1
 31103008	2	0	刑天	250	0	3406	3406	0	0	0	0	90000	8680	0	0	0	0	0	0	0	0	2600	42300	39	0	300	2	5	10071	10072	10073	0	0	0	0	0	0	40	2	14841664	0	0	0	0	3	0	0	186	1	1
 31103009	2	0	山寨嗜天斧	300	0	7186	7186	0	0	0	0	90000	17959	0	0	0	0	0	0	0	0	2600	49350	45	0	300	2	5	10009	0	0	0	0	0	0	0	0	40	2	40197221	0	0	0	0	3	0	0	186	1	1
-31203001	2	0	焚源之炬	70	0	1016	1016	619	0	0	0	10000	782	0	0	0	0	0	0	49986	0	2600	9869	10	0	300	2	5	11000	11001	10300	0	0	0	0	0	0	40	2	30419	0	0	0	0	3	0	0	186	1	1
+31203001	2	0	焚源之炬	70	0	1016	1016	619	0	0	0	10000	782	0	0	0	0	0	0	52600	0	2600	9869	10	0	300	2	5	11000	11001	10300	0	0	0	0	0	0	40	2	30419	0	0	0	0	3	0	0	186	1	1
 31203002	2	0	摄魂铃	100	0	1967	1967	0	0	0	0	10000	2799	0	0	0	0	0	0	220507	0	2600	14100	14	0	300	2	5	11002	11003	10301	0	0	0	0	0	0	40	2	273310	0	0	0	0	3	0	0	186	1	1
 31203003	2	0	乾云镜	125	0	3474	3474	0	0	0	0	10000	5294	0	0	0	0	0	0	356360	0	2600	18330	19	0	300	2	5	11004	11005	10302	0	0	0	0	0	0	40	2	683094	0	0	0	0	3	0	0	186	1	1
 31203004	2	0	天丝琴	160	0	5251	5251	0	0	0	0	10000	7795	0	0	0	0	0	0	641731	0	2600	21150	21	0	300	2	5	11006	11007	10303	0	0	0	0	0	0	40	2	1371678	0	0	0	0	3	0	0	186	1	1
@@ -742,33 +742,33 @@
 60203020	18	0	刑天之主	455	2	48852	48852	0	21	0	0	10000	10546	0	0	0	0	0	0	0	0	2500	2274753	57	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	72283925	477365	0	0	0	5	0	0	186	1	1
 61103000	2	0	境界·个人	80	2	970	970	210	1	0	0	10000	357	0	0	0	0	0	0	32479	0	2500	279006	12	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	75838	0	0	0	0	3	0	0	186	1	1
 61103001	2	0	境界·个人	100	2	1519	1519	456	2	0	0	10000	583	0	0	0	0	0	0	68598	0	2500	355875	15	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	163788	0	0	0	0	3	0	0	186	1	1
-61103002	2	0	境界·个人	175	2	4671	4671	2419	3	0	0	10000	1766	0	0	0	0	0	0	427448	0	2500	659554	23	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	1851780	0	0	0	0	3	0	0	186	1	1
-61103003	2	0	境界·个人	220	2	11218	11218	4528	5	0	0	10000	3868	0	0	0	0	0	0	1169700	0	2500	987908	29	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	6890943	0	0	0	0	3	0	0	186	1	1
-61103004	2	0	境界·个人	250	2	16919	16919	2272	6	0	0	10000	5385	0	0	0	0	0	0	2033326	0	2500	1270711	33	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	21178727	0	0	0	0	3	0	0	186	1	1
-61103005	2	0	境界·个人	270	2	26082	26082	2870	7	0	0	10000	8244	0	0	0	0	0	0	3231996	0	2500	1435837	35	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	36935468	0	0	0	0	3	0	0	186	1	1
-61103006	2	0	境界·个人	280	2	32532	32532	4058	9	0	0	10000	9824	0	0	0	0	0	0	4697177	0	2500	1560156	37	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	68745650	0	0	0	0	3	0	0	186	1	1
-61103007	2	0	境界·个人	310	2	42046	42046	5611	10	0	0	10000	12927	0	0	0	0	0	0	6947889	0	2500	1807845	40	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	28550953	0	0	0	0	3	0	0	186	1	1
-61103008	2	0	境界·个人	320	2	45463	45463	6116	11	0	0	10000	15054	0	0	0	0	0	0	7945161	0	2500	1890408	42	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	59842939	0	0	0	0	3	0	0	186	1	1
-61103009	2	0	境界·个人	340	2	65682	65682	7473	13	0	0	10000	24872	0	0	0	0	0	0	10337650	0	2500	2055534	44	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	13142202	1	0	0	0	3	0	0	186	1	1
-61103010	2	0	境界·个人	350	2	64752	64752	8529	14	0	0	10000	30891	0	0	0	0	0	0	11634528	0	2500	2103933	45	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	69808549	1	0	0	0	3	0	1	186	1	1
-61103011	2	0	境界·个人	370	2	88523	88523	10472	15	0	0	10000	37142	0	0	0	0	0	0	15561579	0	2500	2132403	47	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	28589157	2	0	0	0	3	0	2	186	1	1
-61103012	2	0	境界·个人	380	2	85592	85592	11436	17	0	0	10000	43356	0	0	0	0	0	0	17117709	0	2500	2146638	48	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	12730841	4	0	0	0	3	0	3	186	1	1
+61103002	2	0	境界·个人	175	2	4671	4671	2419	4	0	0	10000	1766	0	0	0	0	0	0	427448	0	2500	659554	23	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	1851780	0	0	0	0	3	0	0	186	1	1
+61103003	2	0	境界·个人	220	2	11218	11218	4528	6	0	0	10000	3868	0	0	0	0	0	0	1169700	0	2500	987908	29	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	6890943	0	0	0	0	3	0	0	186	1	1
+61103004	2	0	境界·个人	250	2	16919	16919	2272	8	0	0	10000	5385	0	0	0	0	0	0	2033326	0	2500	1270711	33	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	21178727	0	0	0	0	3	0	0	186	1	1
+61103005	2	0	境界·个人	270	2	26082	26082	2870	10	0	0	10000	8244	0	0	0	0	0	0	3231996	0	2500	1435837	35	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	36935468	0	0	0	0	3	0	0	186	1	1
+61103006	2	0	境界·个人	280	2	32532	32532	4058	11	0	0	10000	9824	0	0	0	0	0	0	4697177	0	2500	1560156	37	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	68745650	0	0	0	0	3	0	0	186	1	1
+61103007	2	0	境界·个人	310	2	42046	42046	5611	13	0	0	10000	12927	0	0	0	0	0	0	6947889	0	2500	1807845	40	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	28550953	0	0	0	0	3	0	0	186	1	1
+61103008	2	0	境界·个人	320	2	45463	45463	6116	14	0	0	10000	15054	0	0	0	0	0	0	7945161	0	2500	1890408	42	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	59842939	0	0	0	0	3	0	0	186	1	1
+61103009	2	0	境界·个人	340	2	65682	65682	7473	16	0	0	10000	24872	0	0	0	0	0	0	10337650	0	2500	2055534	44	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	13142202	1	0	0	0	3	0	0	186	1	1
+61103010	2	0	境界·个人	350	2	64752	64752	8529	17	0	0	10000	30891	0	0	0	0	0	0	11634528	0	2500	2103933	45	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	69808549	1	0	0	0	3	0	1	186	1	1
+61103011	2	0	境界·个人	370	2	88523	88523	10472	19	0	0	10000	37142	0	0	0	0	0	0	15561579	0	2500	2132403	47	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	28589157	2	0	0	0	3	0	2	186	1	1
+61103012	2	0	境界·个人	380	2	85592	85592	11436	20	0	0	10000	43356	0	0	0	0	0	0	17117709	0	2500	2146638	48	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	12730841	4	0	0	0	3	0	3	186	1	1
 61103013	2	0	境界·个人	360	2	139784	139784	14005	18	0	0	10000	47923	0	0	0	0	0	0	24433230	0	2500	2189343	51	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	27623886	5	0	0	0	3	0	4	186	1	1
 61103014	2	0	境界·个人	380	2	165517	165517	14797	20	0	0	10000	49049	0	0	0	0	0	0	27387065	0	2500	2203578	52	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	33692902	6	0	0	0	3	0	5	186	1	1
-61103015	2	0	境界·个人	400	2	198883	198883	15705	21	0	0	10000	50134	0	0	0	0	0	0	30561791	0	2500	2217813	53	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	58951936	8	0	0	0	3	0	6	186	1	1
+61103015	2	0	境界·个人	400	2	198883	198883	15705	22	0	0	10000	50134	0	0	0	0	0	0	30561791	0	2500	2217813	53	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	58951936	8	0	0	0	3	0	6	186	1	1
 61103016	2	0	境界·个人	410	2	245550	245550	16633	23	0	0	10000	51225	0	0	0	0	0	0	33908022	0	2500	2232048	54	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	142914	8	0	0	0	3	0	7	186	1	1
 61103017	2	0	境界·个人	420	2	324018	324018	17691	24	0	0	10000	52768	0	0	0	0	0	0	37873793	0	2500	2246283	55	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	71560706	9	0	0	0	3	0	8	186	1	1
 61103018	2	0	境界·个人	430	2	443302	443302	18565	25	0	0	10000	53806	0	0	0	0	0	0	41439318	0	2500	2260518	56	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	12788480	10	0	0	0	3	0	9	186	1	1
-61103019	2	0	境界·个人	440	2	689427	689427	19465	27	0	0	10000	54854	0	0	0	0	0	0	45213269	0	2500	2274753	57	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	59788432	10	0	0	0	3	0	10	186	1	1
-61103020	2	0	境界·个人	450	2	1508639	1508639	20459	28	0	0	10000	55911	0	0	0	0	0	0	49095120	0	2500	2288988	58	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	70770549	7	0	0	0	3	0	11	186	1	1
-61203001	2	0	境界·组队	140	2	3509	3509	417	4	0	0	10000	1389	0	0	0	0	0	0	211884	0	2500	480194	19	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	1072042	0	0	0	0	3	0	12	186	1	1
-61203002	2	0	境界·组队	200	2	7481	7481	1072	8	0	0	10000	2652	0	0	0	0	0	0	750932	0	2500	809496	26	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	4502679	0	0	0	0	3	0	13	186	1	1
-61203003	2	0	境界·组队	235	2	12900	12900	1969	12	0	0	10000	4330	0	0	0	0	0	0	1602322	0	2500	1147341	31	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	17091774	0	0	0	0	3	0	14	186	1	1
-61203004	2	0	境界·组队	260	2	20228	20228	2523	16	0	0	10000	6409	0	0	0	0	0	0	2511941	0	2500	1353274	34	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	27820848	3	0	0	0	3	0	15	186	1	1
-61203005	2	0	境界·组队	300	2	40755	40755	5025	19	0	0	10000	11662	0	0	0	0	0	0	5929232	0	2500	1725282	39	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	5306251	6	0	0	0	3	0	16	186	1	1
-61203006	2	0	境界·组队	330	2	57115	57115	6705	22	0	0	10000	18614	0	0	0	0	0	0	8891267	0	2500	1972971	43	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	90029801	8	0	0	0	3	0	17	186	1	1
-61203007	2	0	境界·组队	360	2	80307	80307	9566	26	0	0	10000	33164	0	0	0	0	0	0	13556864	0	2500	2118168	46	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	70921715	10	0	0	0	3	0	18	186	1	1
-61203008	2	0	境界·组队	400	2	126425	126425	13185	29	0	0	10000	48234	0	0	0	0	0	0	21328733	0	2500	2175108	50	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	55735943	40	0	0	0	3	0	19	186	1	1
+61103019	2	0	境界·个人	440	2	689427	689427	19465	26	0	0	10000	54854	0	0	0	0	0	0	45213269	0	2500	2274753	57	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	59788432	10	0	0	0	3	0	10	186	1	1
+61103020	2	0	境界·个人	450	2	1508639	1508639	20459	27	0	0	10000	55911	0	0	0	0	0	0	49095120	0	2500	2288988	58	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	70770549	7	0	0	0	3	0	11	186	1	1
+61203001	2	0	境界·组队	140	2	3509	3509	417	3	0	0	10000	1389	0	0	0	0	0	0	211884	0	2500	480194	19	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	1072042	0	0	0	0	3	0	12	186	1	1
+61203002	2	0	境界·组队	200	2	7481	7481	1072	5	0	0	10000	2652	0	0	0	0	0	0	750932	0	2500	809496	26	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	4502679	0	0	0	0	3	0	13	186	1	1
+61203003	2	0	境界·组队	235	2	12900	12900	1969	7	0	0	10000	4330	0	0	0	0	0	0	1602322	0	2500	1147341	31	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	17091774	0	0	0	0	3	0	14	186	1	1
+61203004	2	0	境界·组队	260	2	20228	20228	2523	9	0	0	10000	6409	0	0	0	0	0	0	2511941	0	2500	1353274	34	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	27820848	3	0	0	0	3	0	15	186	1	1
+61203005	2	0	境界·组队	300	2	40755	40755	5025	12	0	0	10000	11662	0	0	0	0	0	0	5929232	0	2500	1725282	39	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	5306251	6	0	0	0	3	0	16	186	1	1
+61203006	2	0	境界·组队	330	2	57115	57115	6705	15	0	0	10000	18614	0	0	0	0	0	0	8891267	0	2500	1972971	43	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	90029801	8	0	0	0	3	0	17	186	1	1
+61203007	2	0	境界·组队	360	2	80307	80307	9566	18	0	0	10000	33164	0	0	0	0	0	0	13556864	0	2500	2118168	46	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	70921715	10	0	0	0	3	0	18	186	1	1
+61203008	2	0	境界·组队	400	2	126425	126425	13185	21	0	0	10000	48234	0	0	0	0	0	0	21328733	0	2500	2175108	50	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	55735943	40	0	0	0	3	0	19	186	1	1
 61303001	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	15	2	3000	0	0	0	0	0	0	0	214	0	1
 30601001	2	0	暗影剑士	105	0	643	643	0	1	0	0	0	159	0	0	0	0	0	0	0	0	2500	38634	16	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	47423	0	0	0	0	1	0	21	1	1	1
 30601002	2	0	剑魂	105	0	611	611	0	2	0	0	0	128	0	0	0	0	0	0	0	0	2500	38634	16	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	71135	0	0	0	0	1	0	22	1	1	1

--
Gitblit v1.8.0