From 1872c3826019d92a21fbfbbc472c42d73bed5380 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期六, 18 八月 2018 15:36:40 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 12 ++++++------ db/PyMongoDataServer/SysDB/tagChinNPC.txt | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt index eb6eaf0..b4b84d4 100644 --- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt +++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt @@ -1,19 +1,19 @@ id exchangeItemID exchangeItemCount exchangeItemIsBind tokenId tokenCount 1 2333 1 0 1131 12 2 10344 1 0 1134 6 -3 10345 1 0 1134 5 +3 10346 1 0 1134 5 4 10343 1 0 1134 4 5 10347 1 0 1134 3 -6 10346 1 0 1134 2 +6 10345 1 0 1134 2 7 2335 1 0 1132 12 8 10444 1 0 1135 6 -9 10445 1 0 1135 5 +9 10446 1 0 1135 5 10 10443 1 0 1135 4 11 10447 1 0 1135 3 -12 10446 1 0 1135 2 +12 10445 1 0 1135 2 13 2337 1 0 1133 12 14 10544 1 0 1136 6 -15 10545 1 0 1136 5 +15 10546 1 0 1136 5 16 10543 1 0 1136 4 17 10547 1 0 1136 3 -18 10546 1 0 1136 2 +18 10545 1 0 1136 2 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 1b2b3ef..5b1d12a 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -235,19 +235,19 @@ 10804014 0 1 后裔之魂 350 0 272 283 555 14 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 +10904001 0 1 五行之魂 300 0 607 742 1264 15 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 9 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 10904006 0 1 四喜爹 320 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 10904007 0 1 狗蛋 330 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 10904008 0 1 四喜 330 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 -10904009 0 1 云游侠士 340 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 -10904010 0 1 土方道人 340 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 -10904011 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 -10904012 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 -10904013 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 +10904009 0 1 云游侠士 340 0 607 742 1264 6 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 +10904010 0 1 土方道人 340 0 272 283 555 7 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 +10904011 0 1 游方道士 350 0 607 742 1264 8 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 +10904012 0 1 道人学徒 350 0 272 283 555 5 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 +10904013 0 1 辰龙尊者 350 0 607 742 1264 14 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 10904014 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 10904015 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 10904016 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 -- Gitblit v1.8.0