From 2c618db2dcc57d22b49bdb223117e371869b21d3 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期三, 23 一月 2019 16:48:29 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagStore.txt | 36 +++++++++++++++++++----------------- CoreServerGroup/GameServer/PySysDB/tagStore.txt | 2 ++ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt index 342e172..ef48f61 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt @@ -173,6 +173,8 @@ 726 15 0 0 727 15 0 0 728 15 0 0 +729 15 0 0 +730 15 0 0 751 101 0 0 752 101 0 0 753 101 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index a57c5e7..8ef7f12 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -157,22 +157,24 @@ 710 15 0 3516 1 1 [[3506,1,1]] 3516 0 0 106 1 0 1 988 4860 5 OpenTakePreferential2 711 15 0 983 5 1 [] 983 0 0 106 1 0 1 38 150 6 OpenTakePreferential1 712 15 0 983 50 1 [] 983 0 0 106 1 0 1 488 1500 6 OpenTakePreferential2 -713 15 0 5303 200 1 [] 5303 0 0 106 1 0 1 38 200 7 OpenTakePreferential1 -714 15 0 2213 120 1 [[4608,1,1]] 4608 0 0 106 1 0 1 688 2000 7 OpenTakePreferential2 -715 15 0 2213 20 1 [] 2213 0 0 106 1 0 1 38 250 8 OpenTakePreferential1 -716 15 0 982 20 1 [] 982 0 0 106 1 0 1 588 1600 8 OpenTakePreferential2 -717 15 0 153 40 1 [[147,2,1]] 153 0 0 106 1 0 1 38 290 9 OpenTakePreferential1 -718 15 0 2213 100 1 [[4606,1,1]] 2213 0 0 106 1 0 1 688 2250 9 OpenTakePreferential2 -719 15 0 2389 2 1 [] 2389 0 0 106 1 0 1 38 360 10 OpenTakePreferential1 -720 15 0 2390 2 1 [[8354,50,1]] 2390 0 0 106 1 0 1 688 2200 10 OpenTakePreferential2 -721 15 0 2213 20 1 [] 2213 0 0 106 1 0 1 38 250 11 OpenTakePreferential2 -722 15 0 2213 70 1 [[4606,1,1]] 2213 0 0 106 1 0 1 588 1875 11 OpenTakePreferential2 -723 15 0 2390 1 1 [] 2390 0 0 106 1 0 1 88 600 12 OpenTakePreferential1 -724 15 0 2439 1 1 [[8354,50,1]] 2439 0 0 106 1 0 1 688 2000 12 OpenTakePreferential2 -725 15 0 5410 5 1 [] 5410 0 0 106 1 0 1 38 250 13 OpenTakePreferential1 -726 15 0 982 20 1 [] 982 0 0 106 1 0 1 588 1600 13 OpenTakePreferential2 -727 15 0 4606 1 1 [] 4606 0 0 106 1 0 1 88 500 14 OpenTakePreferential1 -728 15 0 5700 6 1 [] 5700 0 0 106 1 0 1 588 1500 14 OpenTakePreferential1 +713 15 0 5303 350 1 [] 5303 0 0 106 1 0 1 68 350 7 OpenTakePreferential1 +714 15 0 4306 1920 1 [] 4306 0 0 106 1 0 1 588 1920 7 OpenTakePreferential2 +715 15 0 2213 50 1 [] 2213 0 0 106 1 0 1 88 625 8 OpenTakePreferential1 +716 15 0 4505 3000 1 [] 4505 0 0 106 1 0 1 688 3000 8 OpenTakePreferential2 +717 15 0 913 1 1 [] 913 0 0 106 1 0 1 88 500 9 OpenTakePreferential1 +718 15 0 109 50 1 [] 109 0 0 106 1 0 1 688 3000 9 OpenTakePreferential2 +719 15 0 5202 10 1 [] 5202 0 0 106 1 0 1 88 500 10 OpenTakePreferential1 +720 15 0 4607 1 1 [[2213,20,1]] 4607 0 0 106 1 0 1 688 2000 10 OpenTakePreferential2 +721 15 0 2390 1 1 [] 2390 0 0 106 1 0 1 88 600 11 OpenTakePreferential1 +722 15 0 2439 2 1 [] 2439 0 0 106 1 0 1 688 2000 11 OpenTakePreferential2 +723 15 0 2444 1 1 [] 2444 0 0 106 1 0 1 88 1000 12 OpenTakePreferential1 +724 15 0 4306 1920 1 [] 4306 0 0 106 1 0 1 588 1920 12 OpenTakePreferential2 +725 15 0 4306 5760 1 [] 4306 0 0 106 1 0 1 1888 5760 12 OpenTakePreferential3 +726 15 0 851 1 1 [] 851 0 0 106 1 0 1 88 300 13 OpenTakePreferential1 +727 15 0 5700 6 1 [] 5700 0 0 106 1 0 1 388 1500 13 OpenTakePreferential2 +728 15 0 2439 2 1 [] 2439 0 0 106 1 0 1 688 2000 13 OpenTakePreferential3 +729 15 0 2454 2 1 [] 2454 0 0 106 1 0 1 88 500 14 OpenTakePreferential1 +730 15 0 2442 2 1 [] 2442 0 0 106 1 0 1 588 1600 14 OpenTakePreferential2 751 101 1 4694 1 1 [[141,300,1]] 4694 0 0 0 1 0 1 88 400 0 LimitGift6 752 101 1 4183 1 1 [[147,6,1]] 4183 0 0 0 1 0 1 288 850 0 LimitGift7 753 101 1 4606 1 1 [[143,300,1]] 4606 0 0 0 1 0 1 688 1600 0 LimitGift8 @@ -238,7 +240,7 @@ 909 30 0 4675 1 1 [] 0 7 0 0 1 0 27 5000 0 0 1001 200 2 2348 1 1 [] 2348 0 0 0 2 2 1 688 2430 0 FlashRushToBuy2 FlashToSnapUp 1002 200 2 5701 1 1 [] 2326 0 0 0 1 10 1 100 125 0 FlashRushToBuy2 FlashToSnapUp -1003 200 2 953 1 1 [] 2319 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp +1003 200 2 2455 1 1 [] 2319 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp 1004 200 2 2213 60 1 [] 2213 0 0 0 2 10 1 188 750 0 FlashRushToBuy2 FlashToSnapUp 1005 200 2 4010 4 1 [] 4010 0 0 0 2 8 1 80 320 0 FlashRushToBuy2 FlashToSnapUp 1006 200 2 4151 40 1 [] 913 0 0 0 4 20 1 58 400 0 FlashRushToBuy2 FlashToSnapUp -- Gitblit v1.8.0