From ebafeb6c1fb9529f083bc7f69d6ab4f7be38b986 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期二, 11 九月 2018 15:26:03 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 4 ++-- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4 ++-- db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 30 +++++++++++++++--------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 7f18e68..d21d339 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 diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt index 30f40a8..03c2f06 100644 --- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt @@ -92,18 +92,18 @@ snxxz.ios.98 828115704 98 0 6 snxxz.ios.128 828115704 128 0 7 snxxz.ios.168 828115704 168 0 8 -575 498mrgame 18 101 0 -576 498mrgame 10 102 0 -577 498mrgame 30 103 0 -578 498mrgame 98 104 0 -579 498mrgame 128 105 0 -580 498mrgame 198 106 0 -581 498mrgame 328 107 0 -582 498mrgame 648 108 0 -583 498mrgame 3000 109 0 -584 498mrgame 1 110 0 -570 498mrgame 6 0 2 -571 498mrgame 30 0 4 -572 498mrgame 68 0 5 -573 498mrgame 128 0 7 -574 498mrgame 168 0 8 +575 mrgame 18 101 0 +576 mrgame 10 102 0 +577 mrgame 30 103 0 +578 mrgame 98 104 0 +579 mrgame 128 105 0 +580 mrgame 198 106 0 +581 mrgame 328 107 0 +582 mrgame 648 108 0 +583 mrgame 3000 109 0 +584 mrgame 1 110 0 +570 mrgame 6 0 2 +571 mrgame 30 0 4 +572 mrgame 68 0 5 +573 mrgame 128 0 7 +574 mrgame 168 0 8 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index f4fd932..4a4aabc 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 -- Gitblit v1.8.0