From 67e44819061a65840a100e16fb08e04ef31935af Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期二, 11 九月 2018 14:37:51 +0800
Subject: [PATCH] 3426  上传错误,还原文件

---
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt |    5 ++---
 db/PyMongoDataServer/SysDB/tagChinNPC.txt         |   11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index d21d339..2fe4b5f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -232,11 +232,11 @@
 10804011	鲸吞真人	350
 10804012	鹏之魂	350
 10804013	神秘老人	350
-10804014	后羿之魂	350
+10804014	后裔之魂	350
 10804015	无涯老人	350
 10804103	神机子	350
 10904001	五行之魂	300
-10904002	琉璃仙子	300
+10904002	琉璃公主	300
 10904003	两仪村长	310
 10904004	大牛	310
 10904005	陈可衣	320
@@ -318,7 +318,6 @@
 50105017	战士xp	1
 50105018	法师xp	1
 50105019	境界压制	1
-50105020	速度压制	1
 50107001	召唤元素	1
 50107002	治疗图腾	65
 50108001	遗失物资(大)	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 4a4aabc..a0b68ab 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -232,11 +232,11 @@
 10804011	0	1	鲸吞真人	350	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10804012	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
 10804013	0	1	神秘老人	350	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
-10804014	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
+10804014	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
 10804015	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
 10804103	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
 10904001	0	1	五行之魂	300	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
-10904002	0	1	琉璃仙子	300	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
+10904002	0	1	琉璃公主	300	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
 10904003	0	1	两仪村长	310	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10904004	0	1	大牛	310	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
 10904005	0	1	陈可衣	320	0	607	742	1264	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1390	3772	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	5	0	0	0	200	0	1
@@ -318,7 +318,6 @@
 50105017	4	10002	战士xp	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	1	0	0	0	2	6	151	0	0	0	0	0	0	0	0	15	2	4	0	0	0	0	1	0	0	102	0	1
 50105018	4	10002	法师xp	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	1	0	0	0	2	6	251	0	0	0	0	0	0	0	0	15	2	4	0	0	0	0	1	0	0	102	0	1
 50105019	4	10002	境界压制	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	1	0	0	0	2	6	23031	0	0	0	0	0	0	0	0	15	2	10	0	0	0	0	1	0	0	102	0	1
-50105020	4	10002	速度压制	1	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1000	1	0	0	0	2	6	23031	0	0	0	0	0	0	0	0	15	2	10	0	0	0	0	1	0	0	102	0	1
 50107001	3	0	召唤元素	1	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	1	1	0	100	0	10	0	0	0	0	0	0	0	0	0	10	2	5	0	0	0	0	0	0	0	101	0	1
 50107002	3	10002	治疗图腾	65	0	727	757	16	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	432	46	0	300	0	0	0	0	0	0	0	0	0	0	0	10	2	6395	0	0	0	0	0	0	0	62	1	1
 50108001	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	10	2	1	0	0	0	0	0	0	0	214	0	1
@@ -520,7 +519,7 @@
 30909017	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
 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	23030	0	0	0	0	0	0	100	2	840145	0	0	0	0	5	0	0	186	1	1
+31003001	2	0	阵殿古猿	160	0	7026	7026	0	0	0	0	0	5895	0	0	0	0	0	0	0	0	2500	62885	22	0	300	2	6	23010	23012	23030	0	0	0	0	0	0	100	2	840145	0	0	0	0	5	0	0	186	1	1
 31003002	2	0	遗迹残魂	210	0	6268	6268	0	0	0	0	0	3904	0	0	0	0	0	0	0	0	2500	92871	28	0	300	2	6	23014	23030	23015	23010	0	0	0	0	0	100	2	9496347	0	0	0	0	5	0	0	186	1	1
 31003003	2	0	遗迹残魂	210	0	6268	6268	0	0	0	0	0	3904	0	0	0	0	0	0	0	0	2500	92871	28	0	300	2	6	23016	23030	23015	23010	0	0	0	0	0	100	2	9496347	0	0	0	0	5	0	0	186	1	1
 31003004	2	0	遗迹古妖	235	0	17520	17520	0	0	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
@@ -554,7 +553,7 @@
 31203002	2	0	摄魂铃幻象	100	0	1603	1603	0	0	0	0	10000	2352	0	0	0	0	0	0	119423	0	2600	14100	14	0	300	2	5	11002	11003	10301	0	0	0	0	0	0	40	2	133345	0	0	0	0	3	0	0	186	1	1
 31203003	2	0	乾云镜幻象	125	0	3703	3703	0	0	0	0	10000	5465	0	0	0	0	0	0	356022	0	2600	18330	19	0	300	2	5	11004	11005	10302	0	0	0	0	0	0	40	2	618460	0	0	0	0	3	0	0	186	1	1
 31203004	2	0	天丝琴幻象	160	0	4934	4934	0	0	0	0	10000	7402	0	0	0	0	0	0	587840	0	2600	21150	21	0	300	2	5	11006	11007	10303	0	0	0	0	0	0	40	2	1281823	0	0	0	0	3	0	0	186	1	1
-31203005	2	0	九幽胄幻象	180	0	6326	6326	0	0	0	0	10000	9033	0	0	0	0	0	0	769936	0	2600	23970	24	0	300	2	5	11008	11009	10304	0	0	0	0	0	0	40	2	1647280	0	0	0	0	3	0	0	186	1	1
+31203005	2	0	九幽胄幻象	180	0	6402	6402	0	0	0	0	10000	9164	0	0	0	0	0	0	769936	0	2600	23970	24	0	300	2	5	11008	11009	10304	0	0	0	0	0	0	40	2	1647280	0	0	0	0	3	0	0	186	1	1
 31203006	2	0	碧霄剑幻象	200	0	9440	9440	3205	0	0	0	10000	13150	0	0	0	0	0	0	1198336	0	2600	26790	26	0	300	2	5	11010	11011	10305	0	0	0	0	0	0	40	2	2259566	0	0	0	0	3	0	0	186	1	1
 31203007	2	0	明心扇幻象	220	0	12977	12977	4330	0	0	0	10000	16970	0	0	0	0	0	0	1751951	0	2600	29610	28	0	300	2	5	11012	11013	10306	0	0	0	0	0	0	40	2	5254527	0	0	0	0	3	0	0	186	1	1
 31203008	2	0	混元伞幻象	240	0	16436	16436	5242	0	0	0	10000	20262	0	0	0	0	0	0	2311139	0	2600	32430	31	0	300	2	5	11014	11015	10307	0	0	0	0	0	0	40	2	8096530	0	0	0	0	3	0	0	186	1	1
@@ -793,7 +792,7 @@
 61203007	2	0	境界·组队	350	2	68437	68437	8508	19	0	0	10000	32103	0	0	0	0	0	0	11509678	0	2500	2101086	45	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	82081834	3	0	0	0	3	0	34	186	1	1
 61203008	2	0	境界·组队	380	2	98370	98370	11180	22	0	0	10000	43273	0	0	0	0	0	0	16261918	0	2500	2143791	48	0	300	0	6	23010	0	0	0	0	0	0	0	1	20	2	30130891	5	0	0	0	3	0	35	186	1	1
 61303001	14	0	仙盟采集桌	1	0	1	1	1	13	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	740	740	0	2	0	0	0	171	0	0	0	0	0	0	0	0	2500	46530	18	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	40950	0	0	0	0	1	0	0	1	1	1
+30601001	2	0	暗影剑士	105	0	740	740	0	0	0	0	0	171	0	0	0	0	0	0	0	0	2500	46530	18	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	40950	0	0	0	0	1	0	0	1	1	1
 30601002	2	0	剑魂	105	0	706	706	0	0	0	0	0	138	0	0	0	0	0	0	0	0	2500	46530	18	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	61426	0	0	0	0	1	0	0	1	1	1
 30603001	2	0	御剑尊者	105	0	2081	2081	0	0	0	0	0	1447	0	0	0	0	0	0	0	0	2500	46530	18	0	300	2	6	10041	23030	10042	0	0	0	0	0	0	15	2	409519	0	0	0	0	5	0	0	186	1	1
 30601003	2	0	魔化哨兵	150	0	1240	1240	0	0	0	0	0	419	0	0	0	0	0	0	0	0	2500	57715	21	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	158536	0	0	0	0	1	0	0	1	1	1

--
Gitblit v1.8.0