From ce7e1cc1f13d5f1cf1fbe9a5b1d88c13f06827dc Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 30 八月 2018 16:40:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc            |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                      |    4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 766bc5a..399ac02 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
index ff1866d..0b2fc4b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index 04b0b3d..0f41a42 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index ea38023..6c99dbb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -504,7 +504,7 @@
 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
+3901	1	0	仙盟兽粮	50	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1	0	5	0	1	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
 3902	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
 3903	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
 4001	0	0	仙界秘境通行证	15	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -550,7 +550,7 @@
 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	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	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	3	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
+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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4250	1	0	冰火冥魂碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	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	200	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	200	0	100	0	1	0	0	0	4213	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

--
Gitblit v1.8.0