From e6b51760f5c69aa6b662bc0ccbf17b26ec56bf08 Mon Sep 17 00:00:00 2001 From: cehua_TRX <526616766@qq.com> Date: 星期二, 09 十月 2018 20:10:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagStore.txt | 20 ++++++++++---------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 CoreServerGroup/GameServer/Script/ChConfig.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 5 +++++ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc index a84ef8b..9562d91 100644 --- a/CoreServerGroup/GameServer/Script/ChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index ead2904..b6af0ba 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 1627fdc..b33818c 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -125,13 +125,13 @@ 706 15 0 801 1 1 [[913,1,1]] 801 0 0 106 1 1 288 700 3 OpenTakePreferential2 707 15 0 3514 1 1 [[3504,1,1]] 0 0 0 106 1 1 88 360 4 OpenTakePreferential1 708 15 0 3515 1 1 [[3505,1,1]] 3514 0 0 106 1 1 288 1080 4 OpenTakePreferential2 -709 15 0 912 1 1 [[30,150,1]] 912 0 0 106 1 1 88 250 5 OpenTakePreferential1 -710 15 0 913 1 1 [[30,500,1]] 913 0 0 106 1 1 388 888 5 OpenTakePreferential2 +709 15 0 912 1 1 [[18,1,1]] 912 0 0 106 1 1 88 250 5 OpenTakePreferential1 +710 15 0 913 1 1 [[15,1,1]] 913 0 0 106 1 1 388 888 5 OpenTakePreferential2 711 15 0 2213 20 1 [] 0 0 0 106 1 1 88 250 6 OpenTakePreferential1 712 15 0 1128 1 1 [[2213,60,1]] 1128 0 0 106 1 1 388 1000 6 OpenTakePreferential2 -713 15 0 30 388 1 [] 0 0 0 106 1 1 188 388 7 OpenTakePreferential1 +713 15 0 852 1 1 [] 0 0 0 106 1 1 188 388 7 OpenTakePreferential1 714 15 0 4606 1 1 [[4608,2,1]] 4606 0 0 106 1 1 688 2000 7 OpenTakePreferential2 -751 16 1 30 500 1 [] 30 0 0 0 1 1 188 500 0 LimitGift6 +751 16 1 15 1 1 [] 15 0 0 0 1 1 188 500 0 LimitGift6 752 17 1 4151 60 1 [] 4151 0 0 0 1 1 188 600 0 LimitGift6 753 18 1 181 40 1 [] 181 0 0 0 1 1 188 600 0 LimitGift6 754 20 1 142 200 1 [[147,7,1]] 142 0 0 0 1 1 188 475 0 LimitGift6 @@ -139,16 +139,16 @@ 756 21 1 4151 70 1 [] 5 0 0 0 1 1 288 700 0 LimitGift7 757 22 1 181 30 1 [] 3514 0 0 0 1 1 88 300 0 LimitGift6 758 22 1 181 70 1 [] 3514 0 0 0 1 1 288 700 0 LimitGift7 -759 23 1 30 300 1 [] 30 0 0 0 1 1 99 300 0 LimitGift6 -760 23 1 30 600 1 [] 30 0 0 0 1 1 299 600 0 LimitGift7 +759 23 1 851 1 1 [] 851 0 0 0 1 1 99 300 0 LimitGift6 +760 23 1 854 1 1 [] 854 0 0 0 1 1 299 600 0 LimitGift7 761 24 1 2213 25 1 [] 0 0 0 0 1 1 188 625 0 LimitGift6 762 24 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 1 388 1150 0 LimitGift7 763 24 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 1 888 2000 0 LimitGift8 764 25 1 181 30 1 [] 0 0 0 0 1 1 88 300 0 LimitGift6 765 25 1 4151 60 1 [] 0 0 0 0 1 1 188 600 0 LimitGift7 766 26 1 4151 30 1 [] 0 0 0 0 1 1 88 300 0 LimitGift6 -767 26 1 30 580 1 [] 30 0 0 0 1 1 288 580 0 LimitGift7 -768 27 1 30 280 1 [] 30 0 0 0 1 1 88 280 0 LimitGift6 +767 26 1 853 1 1 [] 853 0 0 0 1 1 288 580 0 LimitGift7 +768 27 1 850 1 1 [] 850 0 0 0 1 1 88 280 0 LimitGift6 769 27 1 2213 25 1 [] 0 0 0 0 1 1 188 1250 0 LimitGift7 770 28 1 4007 1 1 [[4001,4,1]] 0 0 0 0 1 1 88 240 0 LimitGift6 771 28 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 1 388 1900 0 LimitGift7 @@ -156,10 +156,10 @@ 773 29 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 1 888 3000 0 LimitGift7 774 31 1 2390 1 1 [[913,1,1]] 2390 0 0 0 1 1 388 1000 0 LimitGift6 775 32 1 147 10 1 [[143,300,1]] 143 0 0 0 1 1 288 750 0 LimitGift6 -776 33 1 30 500 1 [[2389,2,1]] 2389 0 0 0 1 1 388 900 0 LimitGift6 +776 33 1 15 1 1 [[2389,2,1]] 2389 0 0 0 1 1 388 900 0 LimitGift6 777 34 1 109 6 1 [[108,15,1]] 109 0 0 0 1 1 388 1100 0 LimitGift6 778 35 1 2213 15 1 [[4606,1,1]] 4606 0 0 0 1 1 688 1450 0 LimitGift6 -779 36 1 30 500 1 [[1128,1,1]] 1128 0 0 0 1 1 388 1000 0 LimitGift6 +779 36 1 15 1 1 [[1128,1,1]] 1128 0 0 0 1 1 388 1000 0 LimitGift6 780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 1 988 2100 0 LimitGift6 801 19 0 2391 1 0 [] 0 0 0 0 0 1 60 0 0 802 19 0 2391 1 0 [] 0 0 0 0 0 1 60 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index d5d4897..b500399 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -139,6 +139,11 @@ 602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 800 1 0 1200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 12000000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 801 1 0 2500万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 25000000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +850 1 0 280绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 280 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +851 1 0 300绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +852 1 0 388绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 388 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +853 1 0 580绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 580 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +854 1 0 600绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 202 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6000 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6001 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 903 50 0 气血散（大） 9 0 1 0 0 300 50 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6002 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0