From e5c392a058d97ccc392e65f5afc16101a6939231 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 29 八月 2018 17:07:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt                                                                |    2 
 db/PyMongoDataServer/PySysDB/tagDailyAction.txt                                                                 |    1 
 CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt                                                           |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt |   16 ++--
 db/PyMongoDataServer/PySysDB/tagPetClassCost.txt                                                                |   40 +++++++++++++
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt                                                                     |    3 
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                                                               |    5 +
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                                                |   11 +--
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                      |    7 +-
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                                       |    9 +-
 CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt                                                           |   26 ++++----
 11 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 1dc73a9..1d61cd7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -282,8 +282,8 @@
 11104016	神机子	350
 50109001	幼龙	441
 50109002	雏凤	441
-50106001	道士鼠	441
-50106002	灵狐仙	441
+50106001	雷霆幼龙	441
+50106002	道士鼠	441
 50106101	冰原狼妖	441
 50106102	鬼将军	441
 50106201	铁壁金刚	441
@@ -295,6 +295,7 @@
 50106304	九黎妖虎	441
 50106305	球球	441
 50106306	荒漠梦魇	441
+50106307	灵狐仙	441
 50105001	傲世神驹	1
 50105002	枪元素	1
 50105003	道元素	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
index 0e81062..f1a71f2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
@@ -15,3 +15,4 @@
 14	0	{}	0	{}
 15	0	{}	0	{}
 16	0	{}	0	{}
+17	0	{"1":[[20,30]],"3":[[20,30]],"5":[[20,30]],"7":[[20,30]]}	30	{}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index 3ea2ccc..9533041 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -3,17 +3,17 @@
 2	31170	0	3	1	21	15	1	21	30	0	1	{}
 3	31170	0	3	4	21	0	4	21	15	1	1	{}
 4	31170	0	3	4	21	15	4	21	30	0	1	{}
-5	31180	0	0	1	20	30	1	21	0	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-6	31180	0	0	4	20	30	4	21	0	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-7	31230	0	0	1	20	0	1	20	15	1	1	{}
-8	31230	0	0	2	20	0	2	20	15	1	1	{}
-9	31230	0	0	3	20	0	3	20	15	1	1	{}
-10	31230	0	0	4	20	0	4	20	15	1	1	{}
-11	31230	0	0	5	20	0	5	20	15	1	1	{}
-12	31230	0	0	6	20	0	6	20	15	1	1	{}
-13	31230	0	0	7	20	0	7	20	15	1	1	{}
-14	31160	0	0	2	20	30	2	21	0	1	1	{}
-15	31160	0	0	5	20	30	5	21	0	1	1	{}
+5	31180	0	0	6	21	0	6	21	30	1	1	{-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+6	31230	0	0	1	20	0	1	20	15	1	1	{}
+7	31230	0	0	2	20	0	2	20	15	1	1	{}
+8	31230	0	0	3	20	0	3	20	15	1	1	{}
+9	31230	0	0	4	20	0	4	20	15	1	1	{}
+10	31230	0	0	5	20	0	5	20	15	1	1	{}
+11	31230	0	0	6	20	0	6	20	15	1	1	{}
+12	31230	0	0	7	20	0	7	20	15	1	1	{}
+13	31160	0	0	2	20	30	2	21	0	1	1	{}
+14	31160	0	0	4	20	30	4	21	0	1	1	{}
+15	31160	0	0	6	20	30	6	21	0	1	1	
 16	31220	1	0	2	19	0	2	20	59	0	11	{0:["FamilyMatchTime", []]}
 17	31220	1	0	2	21	0	2	21	20	1	12	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
 18	31220	1	0	2	21	22	5	18	59	0	13	{}
@@ -21,5 +21,5 @@
 20	31220	1	0	5	21	0	5	21	20	1	22	{-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
 21	31220	1	0	5	21	22	5	23	59	0	23	{}
 22	31220	1	0	6	0	0	2	19	0	0	99	{}
-23	31010	0	0	3	20	30	3	21	0	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-24	31010	0	0	6	20	30	6	21	0	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+23	31010	0	0	3	21	0	3	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+24	31010	0	0	7	21	0	7	21	30	1	1	{-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
index 99e204a..e53e988 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
@@ -123,12 +123,12 @@
 		
               },		
 31003002: {0 : (99, 0, 0),		
-   1 : (96, 0, 0),		
-   2 : (75, 0, 0),		
+   1 : (75, 0, 0),		
+   2 : (60, 0, 0),		
               },		
 31003003: {0 : (99, 0, 0),		
-   1 : (96, 0, 0),		
-   2 : (75, 0, 0),		
+   1 : (75, 0, 0),		
+   2 : (60, 0, 0),		
               },		
 31003004: {0 : (0, 0, 0),		
    1 : (95, 0, 0),		
@@ -142,13 +142,13 @@
    1 : (95, 0, 0),		
    2 : (75, 0, 0),		
               },		
-31003007: {0 : (0, 0, 0),		
-   1 : (95, 0, 0),		
-   2 : (75, 0, 0),		
+31003007: {0 : (75, 0, 0),		
+		
               },		
 31003008: {0 : (0, 0, 0),		
    1 : (95, 0, 0),		
-   2 : (75, 0, 0),		
+   2 : (85, 0, 0),	
+   3 : (75, 0, 0),	
               },		
 31503001: {0 : (0, 0, 0),		
    1 : (90, 0, 0),		
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
index 1070af9..b2c2ca1 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyAction.txt
@@ -15,3 +15,4 @@
 14	999	2	0	0
 15	3	2	0	0
 16	1	2	0	0
+17	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index bc01412..d8708cd 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -1,7 +1,6 @@
 GiftbagID	GiftbagType	OriginalRMB	BuyCountLimit	GiftItemList	MainItemID	NotifyKey
-2	1	39	1	[(109,2,0),(108,3,0)]	109	LimitGift3
-4	2	112	1	[(913,1,0),(4151,100,0)]	913	LimitGift3
-5	3	250	1	[(4608,2,0),(181,150,0)]	4608	LimitGift3
-8	4	600	1	[(4606,2,0),(4607,2,0)]	4607	LimitGift3
-5	5	1000	1	[(101,50,1),(141,50,1)]	101	ConsumptionRebate2
-6	6	2000	1	[(101,60,1),(141,60,1)]	101	
+2	1	88	1	[(196,1,0)]	196	LimitGift3
+4	2	130	1	[(913,1,0),(181,80,0)]	913	LimitGift3
+5	3	200	1	[(4608,2,0),(4151,100,0)]	4608	LimitGift3
+7	4	320	1	[(4214,1,0),(181,180,0)]	4214	LimitGift3
+8	5	600	1	[(4606,2,0),(4607,2,0)]	4606	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 840df3b..174365b 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -469,3 +469,43 @@
 50106306	38	13165	20951
 50106306	39	13717	21794
 50106306	40	0	22642
+50106307	1	1480	460
+50106307	2	1607	668
+50106307	3	1745	889
+50106307	4	1892	1124
+50106307	5	2051	1375
+50106307	6	2220	1642
+50106307	7	2399	1926
+50106307	8	2589	2228
+50106307	9	2789	2549
+50106307	10	3000	2890
+50106307	11	3221	3250
+50106307	12	3453	3633
+50106307	13	3695	4041
+50106307	14	3948	4473
+50106307	15	4211	4931
+50106307	16	4485	5416
+50106307	17	4770	5927
+50106307	18	5064	6466
+50106307	19	5370	7033
+50106307	20	5685	7629
+50106307	21	6012	8255
+50106307	22	6349	8898
+50106307	23	6696	9558
+50106307	24	7054	10235
+50106307	25	7422	10926
+50106307	26	7801	11631
+50106307	27	8190	12349
+50106307	28	8590	13078
+50106307	29	9000	13817
+50106307	30	9421	14564
+50106307	31	9852	15317
+50106307	32	10294	16086
+50106307	33	10746	16868
+50106307	34	11209	17663
+50106307	35	11682	18470
+50106307	36	12166	19288
+50106307	37	12660	20115
+50106307	38	13165	20951
+50106307	39	13717	21794
+50106307	40	0	22642
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 0246bf4..7e4aa50 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -1,6 +1,6 @@
 ID	Quality	UnlockSys	UnLockNeedItemID	UnLockNeedItemCnt	DecomposeExp	InitRank	MaxRank	UseNeedRank	SkillID	SkillUnLock	SkillUnLockSys	InitFightPower
 50106001	2	GetPet	4201	1	1000	1	20	1	48200|48205|48210	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1036
-50106002	2	GetPet1	4202	1	1000	1	20	4	48215|48220|48225	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
+50106002	2	GetPet	4202	1	1000	1	20	4	48215|48220|48225	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
 50106101	3	GetPet2	4203	1	1000	1	30	6	47111|48235|48240	4|10|20	['PetUpLv1','PetUpLv','PetUpLv']	2476
 50106102	3	GetPet3	4204	1	1000	1	30	6	48245|48250|48255	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2476
 50106201	4	GetPet4	4205	1	1000	1	40	6	48260|48265|48270	4|10|20	['PetUpLv','PetUpLv','PetUpLv2']	5716
@@ -12,3 +12,4 @@
 50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv6']	24796
 50106305	3	GetPet11	4213	1	1000	1	30	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	2470
 50106306	4	GetPet12	4214	1	1000	1	40	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	4608
+50106307	2	GetPet1	4215	1	1000	1	40	6	48350|48355|48360	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1400
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 548ecf9..e2ecd06 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
 12	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
 13	3	4	5	6	10	11	12	15	16	17	20	20	22	24	26	28
 14	2	3	4	5	8	9	10	13	14	15	20	16	18	20	22	24
-15	0	0	0	0	2	2	4	4	6	6	6	8	9	10	11	12
+15	0	0	0	0	2	2	3	3	4	4	4	8	9	10	11	12
 16	0	0	1	1	2	2	3	3	4	4	5	5	6	6	6	6
 17	1	1	2	2	3	3	4	4	4	4	4	4	4	4	4	4
 18	0	0	0	0	1	1	2	2	2	2	2	2	2	2	2	2
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index e3367d8..4759951 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -505,8 +505,8 @@
 4190	1	0	鸾凤之魄(天)	28	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3050	0	20	0	1	0	0	85	5000	0	0	7	260	0	0	6	15300	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
 4191	1	0	鸾凤之魄(地)	28	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	2142	0	20	0	1	0	0	85	1500	0	0	7	156	0	0	6	15300	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
 4192	1	0	鸾凤之魄(人)	28	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1156	0	20	0	1	0	0	7	100	0	0	6	9560	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
-4201	1	0	灵宠:道士鼠	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	20	0	1	0	0	77	2000	0	0	78	2000	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
-4202	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	20	0	1	0	0	77	2000	0	0	78	2000	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
+4201	1	0	灵宠:雷霆幼龙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	20	0	1	0	0	77	2000	0	0	78	2000	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
+4202	1	0	灵宠:道士鼠	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	20	0	1	0	0	77	2000	0	0	78	2000	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
 4203	1	0	灵宠:冰原狼妖	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	688	0	50	0	1	0	0	77	8606	0	0	78	8606	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
 4204	1	0	灵宠:鬼将军	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	50	0	1	0	0	77	8606	0	0	78	8606	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
 4205	1	0	灵宠:铁壁金刚	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1588	0	50	0	1	0	0	77	27200	0	0	78	27200	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
@@ -519,10 +519,11 @@
 4212	1	0	灵宠:齐天小美	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4213	1	0	灵宠:球球	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4214	1	0	灵宠:荒漠梦魇	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
+4215	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4250	1	0	冰火冥魂碎片	125	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	736	0	100	0	1	0	0	0	4209	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
 4251	1	0	九黎妖虎碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3444	0	100	0	1	0	0	0	4210	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
 4252	1	0	球球碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3444	0	100	0	1	0	0	0	4210	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
-4253	1	0	灵狐仙碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3444	0	100	0	1	0	0	0	4210	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
+4253	1	0	道士鼠碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	3444	0	100	0	1	0	0	0	4210	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
 4301	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	60	0	5	0	1	0	0	0	260	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
 4302	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	150	0	10	0	1	0	0	0	420	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
 4303	1	0	符印精华	31	0	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	210	0	20	0	1	0	0	0	790	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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index a4b8e69..056d3b8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -282,8 +282,8 @@
 11104016	0	1	神机子	350	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
 50109001	0	0	幼龙	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	300	2	0	0	0	0	0	0	0	0	0	0	10	2	48189	0	0	0	0	0	0	0	1	1	1
 50109002	0	0	雏凤	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	300	2	0	0	0	0	0	0	0	0	0	0	10	2	48189	0	0	0	0	0	0	0	1	1	1
-50106001	16	0	道士鼠	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
-50106002	16	0	灵狐仙	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
+50106001	16	0	雷霆幼龙	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
+50106002	16	0	道士鼠	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106101	16	0	冰原狼妖	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106102	16	0	鬼将军	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106201	16	0	铁壁金刚	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
@@ -295,6 +295,7 @@
 50106304	16	0	九黎妖虎	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106305	16	0	球球	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50106306	16	0	荒漠梦魇	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
+50106307	16	0	灵狐仙	441	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	300	2	8	0	0	0	0	0	0	0	0	0	20	2	48189	0	0	0	0	0	0	0	105	0	1
 50105001	16	0	傲世神驹	1	0	1	2	26	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1200	100	0	300	0	2	0	0	0	0	0	0	0	0	0	10	2	203	0	0	0	0	0	0	0	105	1	2
 50105002	3	0	枪元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	50932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50105003	3	0	道元素	1	0	1	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	3000	1	1	0	100	0	10	55932	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
@@ -516,8 +517,8 @@
 30909018	9	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	1000	0	0	0	0	0	0	0	214	0	1
 30909019	9	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	22213	0	0	0	0	0	0	0	0	10	2	1000	0	0	0	0	0	0	0	214	0	1
 31003001	2	0	阵殿古猿	160	0	7026	7026	0	4	0	0	0	5895	0	0	0	0	0	0	0	0	2500	62885	22	0	300	2	6	23010	23012	0	0	0	0	0	0	0	100	2	840145	0	0	0	0	5	0	0	186	1	1
-31003002	2	0	遗迹残魂	210	0	6699	6699	0	8	0	0	0	4091	0	0	0	0	0	0	0	0	2500	97853	29	0	300	2	6	23014	23015	23010	0	0	0	0	0	0	100	2	11790969	0	0	0	0	5	0	0	186	1	1
-31003003	2	0	遗迹残魂	210	0	6699	6699	0	8	0	0	0	4091	0	0	0	0	0	0	0	0	2500	97853	29	0	300	2	6	23016	23015	23010	0	0	0	0	0	0	100	2	11790969	0	0	0	0	5	0	0	186	1	1
+31003002	2	0	遗迹残魂	210	0	6699	6699	0	8	0	0	0	4091	0	0	0	0	0	0	0	0	2500	97853	29	0	300	2	6	23014	23030	23015	23010	0	0	0	0	0	100	2	11790969	0	0	0	0	5	0	0	186	1	1
+31003003	2	0	遗迹残魂	210	0	6699	6699	0	8	0	0	0	4091	0	0	0	0	0	0	0	0	2500	97853	29	0	300	2	6	23016	23030	23015	23010	0	0	0	0	0	100	2	11790969	0	0	0	0	5	0	0	186	1	1
 31003004	2	0	遗迹古妖	235	0	17520	17520	0	10	0	0	0	11737	0	0	0	0	0	0	0	0	2500	109510	31	0	300	2	6	23010	23017	23030	0	0	0	0	0	0	100	2	25933382	0	0	0	0	5	0	0	186	1	1
 31003005	2	0	遗迹天将	250	0	22863	22863	5783	11	0	0	0	14194	0	0	0	0	0	0	0	0	2500	125866	33	0	300	2	6	23010	23018	23030	0	0	0	0	0	0	100	2	32175092	0	0	0	0	5	0	0	186	1	1
 31003006	2	0	遗迹天将	250	0	22863	22863	0	11	0	0	0	14194	0	0	0	0	0	0	0	0	2500	125866	33	0	300	2	6	23010	23018	23030	0	0	0	0	0	0	100	2	24131319	0	0	0	0	5	0	0	186	1	1

--
Gitblit v1.8.0