From d178c19cfb0bf4a206e1054c1dc691076f098321 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期六, 10 十一月 2018 14:26:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagCTG.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 20 ++++++++++---------- db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +- CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt index 255176a..ac7ee8e 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt @@ -98,4 +98,4 @@ 146 300 0 0 147 60 0 0 148 205 0 0 -149 600 0 0 +149 280 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt index 9df8e72..1f1196f 100644 --- a/db/PyMongoDataServer/PySysDB/tagCTG.txt +++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt @@ -9,7 +9,7 @@ 108 0 6480 1088 6480 [] 109 0 30000 5888 30000 [] 110 0 10 1 0 [] -2 0 60 0 0 [] +2 0 60 6 60 [] 201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]] 202 0 60 6 60 [] 203 0 300 30 300 [] diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt index 1da8062..e0c69cc 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt @@ -98,4 +98,4 @@ 146 300 0 0 0 4 147 60 0 0 0 0 148 205 0 0 0 0 -149 600 0 0 0 0 +149 280 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index ecd8ddd..9f0503e 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -493,7 +493,7 @@ 30203004 2 0 麒麟之魂 260 0 35112 35112 0 0 0 0 10000 45043 0 0 0 0 0 0 0 0 2000 942622 59 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 5299791 0 0 0 0 3 0 0 1 1 1 30203005 2 0 麒麟之魂 310 0 79698 79698 0 0 0 0 10000 91865 0 0 0 0 0 0 0 0 2000 1390474 95 0 300 2 3 0 0 0 0 0 0 0 0 0 40 2 30086907 0 0 0 0 3 0 0 1 1 1 30301001 2 0 精英护卫 200 0 1503 1503 0 6 0 0 10000 25 0 0 780 0 0 0 0 1 3000 634880 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 34243 0 0 0 0 1 48352 7 1 1 1 -30301002 2 0 精英护卫 230 0 1839 1839 0 8 0 0 10000 55 0 0 780 0 0 0 0 1 3000 738321 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 51163 0 0 0 0 1 72243 13 1 1 1 +30301002 2 0 精英护卫 230 0 1839 1839 0 8 0 0 10000 55 0 0 780 0 0 0 0 1 3000 738321 0 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 51163 0 0 0 0 1 83079 13 1 1 1 30303001 2 0 天枢 160 0 2524 2524 0 4 0 0 10000 3100 0 1 0 0 0 0 0 3 3000 444132 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5799139 0 10000 0 0 5 0 0 186 1 1 30303002 2 0 天璇 180 0 3754 3754 0 5 0 0 10000 4847 0 1 0 0 0 0 0 3 3000 501072 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 8527731 0 10000 0 0 5 0 0 186 1 1 30303003 2 0 天玑 210 0 6200 6200 0 6 0 0 10000 7908 0 1 0 0 0 0 0 3 3000 597186 31 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 23982232 0 10000 0 0 5 0 0 186 1 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index ed001b9..948afee 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -1894,16 +1894,16 @@ 30817 幻羽 30800 8 10 2 4 0 20 0 0 0 0 0 2 0 0 0 0 0 0 0 513 2700 7 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21200 0 0 0 20025 0 0 0 2 1529 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30818 幻羽 30800 9 10 2 4 0 20 0 0 0 0 0 2 0 0 0 0 0 0 0 513 2850 7 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21200 0 0 0 20025 0 0 0 2 1784 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30819 幻羽 30800 10 10 2 4 0 20 0 0 0 0 0 2 0 0 0 0 0 0 0 513 3000 7 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21200 0 0 0 20025 0 0 0 2 2039 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30850 旁敲侧击 30850 1 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 1000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2294 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30851 旁敲侧击 30850 2 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 2000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2549 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30852 旁敲侧击 30850 3 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 3000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2804 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30853 旁敲侧击 30850 4 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 4000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3059 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30854 旁敲侧击 30850 5 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 5000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3313 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30855 旁敲侧击 30850 6 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 6000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3568 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30856 旁敲侧击 30850 7 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 7000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4340 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30857 旁敲侧击 30850 8 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 8000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4546 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30858 旁敲侧击 30850 9 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 9000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4753 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -30859 旁敲侧击 30850 10 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 10000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30850 旁敲侧击 30850 1 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 100 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2294 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30851 旁敲侧击 30850 2 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 200 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2549 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30852 旁敲侧击 30850 3 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 300 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 2804 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30853 旁敲侧击 30850 4 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 400 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3059 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30854 旁敲侧击 30850 5 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 500 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3313 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30855 旁敲侧击 30850 6 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 600 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 3568 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30856 旁敲侧击 30850 7 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 700 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4340 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30857 旁敲侧击 30850 8 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 800 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4546 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30858 旁敲侧击 30850 9 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 900 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4753 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +30859 旁敲侧击 30850 10 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 1000 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 20600 0 0 0 0 0 0 0 2 4960 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30900 不灭法身 30900 1 15 2 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4028 0 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 20900 30850 6 0 20015 0 0 0 2 5167 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30901 不灭法身 30900 2 15 2 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4028 0 2500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 20900 30850 6 0 20015 0 0 0 2 227 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30902 不灭法身 30900 3 15 2 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4028 0 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 20900 30850 6 0 20015 0 0 0 2 454 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0