From bf7cefc032cd57c6f8f565afab3689dd87e0a044 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期二, 23 十月 2018 19:29:21 +0800 Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0 --- db/PyMongoDataServer/PySysDB/tagStore.txt | 94 +++++++++++++++++++++++----------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt index 869b60e..73c8eb6 100644 --- a/db/PyMongoDataServer/PySysDB/tagStore.txt +++ b/db/PyMongoDataServer/PySysDB/tagStore.txt @@ -35,8 +35,8 @@ 104 3 0 3511 1 0 [] 0 0 0 0 0 0 1 10 0 0 108 3 0 4205 1 1 [] 0 0 0 158 1 0 1 1268 0 0 109 3 0 256 1 1 [] 0 0 0 168 1 0 1 1268 0 0 -110 3 0 4207 1 1 [] 0 0 0 185 1 0 1 5888 0 0 -111 3 0 257 1 1 [] 0 0 0 210 1 0 1 5888 0 0 +110 3 0 4207 1 1 [] 0 0 0 210 1 0 1 5888 0 0 +111 3 0 257 1 1 [] 0 0 0 185 1 0 1 5888 0 0 112 3 0 5305 1 0 [] 0 0 0 300 0 0 1 200 0 0 113 3 0 5306 1 0 [] 0 0 0 350 0 0 1 300 0 0 114 3 0 4219 1 1 [] 0 0 0 122 1 0 1 388 0 0 @@ -47,8 +47,8 @@ 154 4 0 911 1 1 [] 0 0 0 0 0 0 2 15 0 0 157 4 0 4205 1 1 [] 0 0 0 158 1 0 2 1588 0 0 158 4 0 256 1 1 [] 0 0 0 168 1 0 2 1588 0 0 -159 4 0 4207 1 1 [] 0 0 0 185 1 0 2 8888 0 0 -160 4 0 257 1 1 [] 0 0 0 210 1 0 2 8888 0 0 +159 4 0 4207 1 1 [] 0 0 0 210 1 0 2 8888 0 0 +160 4 0 257 1 1 [] 0 0 0 185 1 0 2 8888 0 0 161 4 0 914 1 1 [] 0 0 0 0 0 0 2 20 0 0 162 4 0 956 1 1 [] 0 0 0 250 0 0 2 10 0 0 163 4 0 4001 1 1 [] 0 0 0 0 0 0 2 30 0 0 @@ -118,50 +118,50 @@ 651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 0 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 0 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 0 1 1088 2780 0 Bargaingift3 -701 15 0 912 1 1 [[2345,1,1]] 912 0 0 106 1 0 1 88 390 1 OpenTakePreferential1 -702 15 0 4185 1 1 [] 4185 0 0 106 1 0 1 288 800 1 OpenTakePreferential2 -703 15 0 2343 1 1 [] 0 0 0 106 1 0 1 88 380 2 OpenTakePreferential1 -704 15 0 2344 1 1 [] 2344 0 0 106 1 0 1 288 1000 2 OpenTakePreferential2 -705 15 0 9 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 750 3 OpenTakePreferential1 -706 15 0 6 2 1 [[913,2,1]] 913 0 0 106 1 0 1 488 1800 3 OpenTakePreferential2 -707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 288 1080 4 OpenTakePreferential1 -708 15 0 3515 2 1 [[3505,2,1]] 3515 0 0 106 1 0 1 688 3240 4 OpenTakePreferential2 -709 15 0 912 1 1 [[30,588,1]] 30 0 0 106 1 0 1 188 738 5 OpenTakePreferential1 -710 15 0 913 1 1 [[30,1588,1]] 30 0 0 106 1 0 1 588 2088 5 OpenTakePreferential2 -711 15 0 2213 60 1 [[4610,1,1]] 4610 0 0 106 1 0 1 188 950 6 OpenTakePreferential1 -712 15 0 2213 140 1 [[1128,1,1]] 1128 0 0 106 1 0 1 588 2000 6 OpenTakePreferential2 -713 15 0 30 588 1 [[912,1,1]] 30 0 0 106 1 0 1 188 738 7 OpenTakePreferential1 -714 15 0 4606 2 1 [[4608,2,1]] 4606 0 0 106 1 0 1 688 3000 7 OpenTakePreferential2 -751 16 1 15 1 1 [] 15 0 0 0 1 0 1 188 500 0 LimitGift6 -752 17 1 4151 60 1 [] 4151 0 0 0 1 0 1 188 600 0 LimitGift6 -753 18 1 181 40 1 [] 181 0 0 0 1 0 1 188 600 0 LimitGift6 -754 20 1 142 200 1 [[147,7,1]] 142 0 0 0 1 0 1 188 475 0 LimitGift6 -755 21 1 4151 30 1 [] 3 0 0 0 1 0 1 88 300 0 LimitGift6 -756 21 1 4151 70 1 [] 5 0 0 0 1 0 1 288 700 0 LimitGift7 -757 22 1 181 30 1 [] 3514 0 0 0 1 0 1 88 300 0 LimitGift6 -758 22 1 181 70 1 [] 3514 0 0 0 1 0 1 288 700 0 LimitGift7 -759 23 1 851 1 1 [] 851 0 0 0 1 0 1 99 300 0 LimitGift6 -760 23 1 854 1 1 [] 854 0 0 0 1 0 1 299 600 0 LimitGift7 -761 24 1 2213 25 1 [] 0 0 0 0 1 0 1 188 625 0 LimitGift6 -762 24 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 0 1 388 1150 0 LimitGift7 -763 24 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 0 1 888 2000 0 LimitGift8 -764 25 1 181 30 1 [] 0 0 0 0 1 0 1 88 300 0 LimitGift6 -765 25 1 4151 60 1 [] 0 0 0 0 1 0 1 188 600 0 LimitGift7 -766 26 1 4151 30 1 [] 0 0 0 0 1 0 1 88 300 0 LimitGift6 -767 26 1 853 1 1 [] 853 0 0 0 1 0 1 288 580 0 LimitGift7 -768 27 1 850 1 1 [] 850 0 0 0 1 0 1 88 280 0 LimitGift6 -769 27 1 2213 25 1 [] 0 0 0 0 1 0 1 188 1250 0 LimitGift7 -770 28 1 4007 1 1 [[4001,4,1]] 0 0 0 0 1 0 1 88 240 0 LimitGift6 -771 28 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 0 1 388 1900 0 LimitGift7 -772 29 1 3513 2 1 [[3503,2,1]] 3513 0 0 0 1 0 1 88 360 0 LimitGift6 -773 29 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 0 1 888 3000 0 LimitGift7 -774 31 1 2390 1 1 [[913,1,1]] 2390 0 0 0 1 0 1 388 1000 0 LimitGift6 -775 32 1 147 10 1 [[143,300,1]] 143 0 0 0 1 0 1 288 750 0 LimitGift6 -776 33 1 15 1 1 [[2389,2,1]] 2389 0 0 0 1 0 1 388 900 0 LimitGift6 -777 34 1 109 6 1 [[108,15,1]] 109 0 0 0 1 0 1 388 1100 0 LimitGift6 +701 15 0 912 1 1 [[142,300,1]] 142 0 0 106 1 0 1 188 600 1 OpenTakePreferential1 +702 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 1 OpenTakePreferential2 +703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 188 500 2 OpenTakePreferential1 +704 15 0 2344 2 1 [] 2344 0 0 106 1 0 1 888 2400 2 OpenTakePreferential2 +705 15 0 6 1 1 [[143,100,1]] 143 0 0 106 1 0 1 188 600 3 OpenTakePreferential1 +706 15 0 9062 1 1 [[6,3,1]] 9062 0 0 106 1 0 1 888 2700 3 OpenTakePreferential2 +707 15 0 3514 2 1 [[3504,2,1]] 3514 0 0 106 1 0 1 188 1080 4 OpenTakePreferential1 +708 15 0 3516 1 1 [[3506,1,1]] 3516 0 0 106 1 0 1 888 4860 4 OpenTakePreferential2 +709 15 0 913 1 1 [[4694,3,1]] 913 0 0 106 1 0 1 188 800 5 OpenTakePreferential1 +710 15 0 1002 2 1 [[30,2000,1]] 30 0 0 106 1 0 1 888 3000 5 OpenTakePreferential2 +711 15 0 2213 40 1 [[1502,4,1]] 2213 0 0 106 1 0 1 188 700 6 OpenTakePreferential1 +712 15 0 2213 150 1 [[4680,1,1]] 4680 0 0 106 1 0 1 888 2625 6 OpenTakePreferential2 +713 15 0 2213 40 1 [[5303,200,1]] 2213 0 0 106 1 0 1 188 700 7 OpenTakePreferential1 +714 15 0 4186 1 1 [[2390,1,1]] 4186 0 0 106 1 0 1 888 2550 7 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 +754 102 1 4695 1 1 [[4662,1,1]] 4695 0 0 0 1 0 1 88 550 0 LimitGift6 +755 102 1 3515 1 1 [[983,10,1]] 3515 0 0 0 1 0 1 288 1110 0 LimitGift7 +756 102 1 5006 5 1 [[5007,2,1]] 5007 0 0 0 1 0 1 688 1750 0 LimitGift8 +757 103 1 4694 3 1 [[912,1,1]] 912 0 0 0 1 0 1 88 450 0 LimitGift6 +758 103 1 4670 5 1 [[196,1,1]] 196 0 0 0 1 0 1 288 1030 0 LimitGift7 +759 103 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8 +760 104 1 4609 1 1 [[2213,30,1]] 4609 0 0 0 1 0 1 88 4750 0 LimitGift6 +761 104 1 4608 1 1 [[4610,5,1]] 4608 0 0 0 1 0 1 288 1500 0 LimitGift7 +762 104 1 4606 2 1 [[4609,5,1]] 4606 0 0 0 1 0 1 688 2500 0 LimitGift8 +763 105 1 912 1 1 [[30,200,1]] 912 0 0 0 1 0 1 88 350 0 LimitGift6 +764 105 1 196 1 1 [[144,150,1]] 196 0 0 0 1 0 1 288 980 0 LimitGift7 +765 105 1 147 16 1 [[153,200,1]] 153 0 0 0 1 0 1 688 1600 0 LimitGift8 +766 106 1 4609 1 1 [[144,100,1]] 4609 0 0 0 1 0 1 88 300 0 LimitGift6 +767 106 1 4608 1 1 [[983,10,1]] 4608 0 0 0 1 0 1 288 800 0 LimitGift7 +768 106 1 4183 1 1 [[4151,150,1]] 4183 0 0 0 1 0 1 688 2200 0 LimitGift8 +769 107 1 2389 2 1 [] 2389 0 0 0 1 0 1 88 360 0 LimitGift6 +770 107 1 2390 1 1 [[8354,20,1]] 2390 0 0 0 1 0 1 288 1000 0 LimitGift7 +771 107 1 2390 3 1 [] 2390 0 0 0 1 0 1 688 1800 0 LimitGift8 +772 108 1 153 80 1 [[147,6,1]] 153 0 0 0 1 0 1 88 630 0 LimitGift6 +773 108 1 4606 1 1 [[2213,70,1]] 4606 0 0 0 1 0 1 288 8750 0 LimitGift7 +774 108 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8 +775 32 1 147 10 1 [[143,300,1]] 143 0 0 0 1 0 1 88 750 0 LimitGift6 +776 33 1 15 1 1 [[2389,2,1]] 2389 0 0 0 1 0 1 288 900 0 LimitGift7 +777 34 1 109 6 1 [[108,15,1]] 109 0 0 0 1 0 1 888 1100 0 LimitGift8 778 35 1 2213 15 1 [[4606,1,1]] 4606 0 0 0 1 0 1 688 1450 0 LimitGift6 -779 36 1 15 1 1 [[1128,1,1]] 1128 0 0 0 1 0 1 388 1000 0 LimitGift6 -780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 0 1 988 2100 0 LimitGift6 +779 36 1 15 1 1 [[1128,1,1]] 1128 0 0 0 1 0 1 388 1000 0 LimitGift7 +780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 0 1 988 2100 0 LimitGift8 801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0 802 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0 803 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0 -- Gitblit v1.8.0