From d2c4db71da055b09a32aef8198827072034d168e Mon Sep 17 00:00:00 2001 From: cehua_lgq <cehua_lgq@163.com> Date: 星期四, 30 八月 2018 15:20:33 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 17 +++++++++++++---- db/PyMongoDataServer/PySysDB/tagStore.txt | 6 +++--- db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 6 +++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt index 7e4aa50..34dae6e 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt @@ -10,6 +10,6 @@ 50106302 5 GetPet9 4207 1 1000 1 50 6 48305|48310|48315 4|10|20 ['PetUpLv','PetUpLv','PetUpLv5'] 31996 50106303 4 GetPet6 4209 1 1000 1 40 6 48335|48340|48345 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 13248 50106304 5 GetPet10 4210 1 1000 1 50 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv6'] 24796 -50106305 3 GetPet11 4213 1 1000 1 30 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2470 -50106306 4 GetPet12 4214 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 4608 -50106307 2 GetPet1 4215 1 1000 1 40 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1400 +50106305 3 GetPet11 4213 1 1000 1 30 6 48380|48385|48390 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2470 +50106306 4 GetPet12 4214 1 1000 1 40 6 48410|48415|48420 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 4608 +50106307 2 GetPet1 4215 1 1000 1 40 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1400 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index ef03015..e3087d2 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -100,9 +100,9 @@ 561 13 0 4606 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2 562 13 0 4608 1 0 [] 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2 563 13 0 912 1 0 [] 0 0 0 0 0 25 100 0 0 ShopBuyBroadcast_2 -651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 1 188 500 0 ShopBuyBroadcast_1 -652 14 0 4208 1 1 [[4151,60,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 1 388 1200 0 ShopBuyBroadcast_1 -653 14 0 255 1 1 [[196,1,1],[181,140,1],[913,1,1]] 255 0 0 0 1 1 1088 2780 0 ShopBuyBroadcast_1 +651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 1 188 500 0 Bargaingift1 +652 14 0 4208 1 1 [[4151,60,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 1 388 1200 0 Bargaingift2 +653 14 0 255 1 1 [[196,1,1],[181,140,1],[913,1,1]] 255 0 0 0 1 1 1088 2780 0 Bargaingift3 701 15 0 912 1 1 [[2345,1,1]] 912 0 0 106 1 1 88 390 1 OpenTakePreferential1 702 15 0 4185 1 1 [] 4185 0 0 106 1 1 288 800 1 OpenTakePreferential2 703 15 0 2343 1 1 [] 0 0 0 106 1 1 88 380 2 OpenTakePreferential1 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 93c7332..782ab49 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -663,9 +663,9 @@ 48200 强击 48200 1 1 0 6 0 1 2 0 2 8 81 9 0 500 0 0 0 0 0 1010 10000 0 0 1200 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1178 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48205 道法自然 48205 1 1 0 6 0 20 0 0 0 0 111 0 0 0 0 0 0 0 0 9 75 1 0 10 75 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2945 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48210 冰霜似雪 48210 1 1 0 6 0 14 0 0 1 0 41 8 0 20000 0 0 0 0 0 16 4000 4 0 4012 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 10307 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -48215 灵狐之力 48215 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1000 10000 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 0 0 0 0 0 0 0 0 2 1448 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 -48220 灵狐锁心 48220 1 1 0 6 0 14 3 0 1 0 41 8 0 20000 0 0 0 0 0 4012 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 2000 0 0 0 0 0 0 0 0 0 0 0 0 2 3620 0 0 0 0 507 507 4 8 0 0 0 0 0 0 -48225 灵狐之怒 48225 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 508 2 500 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 0 0 0 0 0 0 0 0 2 12670 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +48215 灵通秘术 48215 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1000 10000 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 0 0 0 0 0 0 0 0 2 1448 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 +48220 凝神归元 48220 1 1 0 6 0 14 3 0 1 0 41 8 0 20000 0 0 0 0 0 4012 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1000 2000 0 0 0 0 0 0 0 0 0 0 0 0 2 3620 0 0 0 0 507 507 4 8 0 0 0 0 0 0 +48225 清明自在 48225 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 508 2 500 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 0 0 0 0 0 0 0 0 2 12670 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48230 无用 48230 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1000 10000 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 0 0 0 0 0 0 0 0 2 3733 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48235 妖狼之力 48235 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1500 10000 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 0 0 0 0 0 0 0 0 2 9332 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 48240 神之奉献 48240 1 1 0 6 0 5 0 0 0 0 10 0 0 30000 0 0 0 0 0 9 1500 3 0 10 1500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 32662 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -698,6 +698,15 @@ 48365 咆哮之力 48365 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2500 10000 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 0 0 0 0 0 0 0 0 2 6568 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 48370 九黎真身 48370 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 5 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 0 0 0 0 0 0 0 0 2 57470 0 0 0 0 0 0 0 0 0 0 0 0 0 0 48375 妖虎之威 48375 1 1 0 6 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 10000 0 4503 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 6000 0 0 0 0 0 0 0 0 0 0 0 0 2 22420 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +48380 球球之力 48380 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1500 10000 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 0 0 0 0 0 0 0 0 2 3016 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 +48385 球球震慑 48385 1 1 0 6 0 17 0 0 1 0 91 8 0 40000 0 0 0 0 0 4004 10000 0 0 121 2000 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 7540 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +48390 球球守护 48390 1 1 0 6 0 16 0 0 0 0 111 0 0 20000 0 0 0 0 0 4023 10000 4000 0 13 2000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 26390 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +48395 灵狐之力 48395 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1000 10000 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 0 0 0 0 0 0 0 0 2 1448 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 +48400 灵狐锁心 48400 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 2 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 0 0 0 0 0 0 0 0 2 3620 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +48405 灵狐之怒 48405 1 1 0 6 0 16 0 0 0 0 111 0 0 0 0 0 0 0 0 4039 20 0 0 4508 0 0 0 1011 1 1 0 74 5000 3 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 12670 0 0 0 0 0 0 4 0 0 0 0 0 0 0 +48410 梦魇之力 48410 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 2000 10000 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 0 0 0 0 0 0 0 0 2 6866 0 0 0 0 0 0 0 0 0 48200 0 0 0 0 +48415 梦魇之殇 48415 1 1 0 6 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4039 30 0 0 4508 0 0 0 1011 1 1 0 74 30000 3 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 17165 0 0 0 0 0 0 4 0 0 0 0 0 0 0 +48420 梦魇附身 48420 1 1 0 6 0 5 0 0 0 0 10 0 0 60000 0 0 0 0 0 9 5000 3 0 10 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 60077 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49000 固本 49000 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 100 6 1000 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 0 0 0 0 0 0 0 0 2 1242 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49005 精准 49005 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 14 800 3 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 0 0 0 0 0 0 0 0 2 3105 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49010 培元 49010 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 2 6 1000 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 0 0 0 0 0 0 0 0 2 10867 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -734,7 +743,7 @@ 49146 定身 49146 1 1 0 0 0 14 3 0 1 0 41 0 0 0 0 0 0 0 0 4012 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2500 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 511 511 4 8 0 0 0 0 0 0 49150 驭灵 49150 1 1 0 5 0 17 0 0 0 0 41 8 0 25000 0 0 0 0 0 4023 10000 4000 0 13 2000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 10736 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49155 阴阳 49155 1 1 0 5 0 16 0 0 0 0 10 0 0 30000 0 0 0 0 0 4004 10000 0 0 4511 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 26840 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -49160 神游 49160 1 1 0 5 0 16 0 0 0 0 10 0 0 60000 0 0 0 0 0 4023 10000 7000 0 19 4000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 93940 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +49160 神游 49160 1 1 0 5 0 16 0 0 0 0 10 0 0 60000 0 0 0 0 0 4023 10000 7000 0 19 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 93940 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49165 坚韧 49165 1 1 0 5 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 2000 0 13 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 7239 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49170 健体 49170 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 304 6 1500 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 0 0 0 0 0 0 0 0 2 18097 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49175 潜心 49175 1 1 0 5 0 7 3 0 0 0 0 0 0 0 0 0 0 0 0 4002 2000 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 0 0 0 0 0 0 0 0 2 63339 0 0 0 0 0 0 0 4 0 0 0 0 0 0 -- Gitblit v1.8.0