From 9fce37e7270a13e3bffa34716fa762e8dc9fc94e Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期三, 26 九月 2018 22:31:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/Config/DBConfig.pyc | 0 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 10 +- db/PyMongoDataServer/Common/CommFunc.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 4 db/PyMongoDataServer/PySysDB/tagSuccess.txt | 111 +++++++++++----------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 db/PyMongoDataServer/PyMongoDataServer.ini | 7 db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 124 ++++++++++++------------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 11 files changed, 128 insertions(+), 128 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 9d3e7b1..11d57a7 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc index 3bcf8a2..3cb75ac 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc index 687d502..86ccb7f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc Binary files differ diff --git a/db/PyMongoDataServer/Common/CommFunc.pyc b/db/PyMongoDataServer/Common/CommFunc.pyc index 1d4c21b..777dab6 100644 --- a/db/PyMongoDataServer/Common/CommFunc.pyc +++ b/db/PyMongoDataServer/Common/CommFunc.pyc Binary files differ diff --git a/db/PyMongoDataServer/Config/DBConfig.pyc b/db/PyMongoDataServer/Config/DBConfig.pyc index 6bcc037..642a37b 100644 --- a/db/PyMongoDataServer/Config/DBConfig.pyc +++ b/db/PyMongoDataServer/Config/DBConfig.pyc Binary files differ diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc index 3b2be1a..ccdfc07 100644 --- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc +++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc Binary files differ diff --git a/db/PyMongoDataServer/PyMongoDataServer.ini b/db/PyMongoDataServer/PyMongoDataServer.ini index 01faa76..5241c8c 100644 --- a/db/PyMongoDataServer/PyMongoDataServer.ini +++ b/db/PyMongoDataServer/PyMongoDataServer.ini @@ -13,6 +13,10 @@ ;混服平台合服后主服ID, 配置不带字母s, 纯数字, 格式: 平台 + MainServerID, 如果没有配置则默认取 ServerID 173on_lanMainServerID=9999 +;思璞登录需要key验证 +spxjgame_LoginKey=123 + + [EventReport] AppId=AppId1 Key=7ded96779343f198de9b95a05a0704c9 @@ -24,6 +28,3 @@ OSName=all GeTuiUrl=http://127.0.0.1:53000/getui/index.php -;思璞游戏 -[SPGame] -LoginKey = 132 \ No newline at end of file diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 885e404..28d88e7 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -171,5 +171,5 @@ 2384 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4250,1]]] [[9000,0],[10000,1]] [4250] 2385 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[223,1]]] [[9000,0],[10000,1]] [223] 2386 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4251,1]]] [[9000,0],[10000,1]] [4251] -2387 0 8353_1 [[57,[8204,1]],[114,[8217,1]],[171,[8230,1]],[228,[8243,1]],[285,[8256,1]],[513,[8203,1]],[741,[8216,1]],[969,[8229,1]],[1197,[8242,1]],[1425,[8255,1]],[3139,[8202,1]],[4853,[8215,1]],[6567,[8228,1]],[8281,[8241,1]],[10000,[8254,1]]] 3 [[38,[8207,1]],[76,[8220,1]],[114,[8233,1]],[152,[8246,1]],[190,[8259,1]],[536,[8206,1]],[882,[8219,1]],[1228,[8232,1]],[1574,[8245,1]],[1920,[8258,1]],[3458,[8205,1]],[4996,[8218,1]],[6534,[8231,1]],[8072,[8244,1]],[9610,[8257,1]],[10000,[8354,1]]] 1 [8206,8219,8232,8245,8258,8207,8220,8233,8246,8259] -2388 0 [[2000,[8201,1]],[4000,[8214,1]],[6000,[8227,1]],[8000,[8240,1]],[10000,[8253,1]]] 3 [[28,[8204,1]],[56,[8217,1]],[84,[8230,1]],[112,[8243,1]],[140,[8256,1]],[397,[8203,1]],[654,[8216,1]],[911,[8229,1]],[1168,[8242,1]],[1425,[8255,1]],[2567,[8202,1]],[3709,[8215,1]],[4851,[8228,1]],[5993,[8241,1]],[7135,[8254,1]],[10000,[8252,1]]] 1 +2387 0 8353_1 [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]] 3 [[740,[8354,1]],[2221,[8205,1]],[3702,[8218,1]],[5183,[8231,1]],[6664,[8244,1]],[8145,[8257,1]],[8478,[8206,1]],[8811,[8219,1]],[9144,[8232,1]],[9477,[8245,1]],[9810,[8258,1]],[9847,[8207,1]],[9884,[8220,1]],[9921,[8233,1]],[9958,[8246,1]],[10000,[8259,1]]] 1 [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259] +2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1 diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt index cb73875..ed0180a 100644 --- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt +++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt @@ -19,85 +19,85 @@ 2 1 0 1506 1129 3500 350 714 649 505 451 0 150 3 18 292 7 0 0 505 142 350 677 0 1506 571 200 200 2 2 0 2695 2021 3500 350 1261 1146 818 808 0 250 7 44 515 12 0 0 818 252 350 1212 0 2695 1009 300 300 2 3 0 4416 3312 3500 391 2598 2362 1370 1324 102 400 18 103 1063 20 0 0 1370 519 391 1987 0 4416 2078 450 450 -3 1 0 2749 2062 3500 350 1295 1177 825 824 0 260 8 47 529 13 0 0 825 259 350 1237 0 2749 1036 310 310 -3 2 0 3944 2958 3500 383 2189 1990 1266 1183 73 375 16 91 895 18 0 0 1266 437 383 1774 0 3944 1751 425 425 -3 3 0 9866 7399 3500 424 6042 5492 2180 2959 125 500 28 155 2471 25 0 0 2180 1208 424 4439 0 9866 4833 550 550 -3 3 1 9866 7399 3500 424 6042 5492 2180 2959 125 500 28 155 2471 25 0 0 2180 1208 424 4439 0 9866 4833 550 550 -3 4 1 18432 13824 17916 2384 18787 17079 2797 5529 963 625 44 234 7685 31 0 0 2797 3757 2384 8294 0 18432 15029 675 675 -3 4 2 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 -4 1 0 3422 2567 3500 373 1821 1655 1184 1026 43 345 14 79 745 17 0 0 1184 364 373 1540 0 3422 1456 395 395 -4 2 0 6316 4737 3500 402 3817 3470 1925 1894 108 435 21 120 1561 21 0 0 1925 763 402 2842 0 6316 3054 485 485 -4 3 0 9866 7399 3500 424 6042 5492 2180 2959 125 500 28 155 2471 25 0 0 2180 1208 424 4439 0 9866 4833 550 550 -4 3 1 18432 13824 17916 2384 18787 17079 2797 5529 963 625 44 234 7685 31 0 0 2797 3757 2384 8294 0 18432 15029 675 675 -4 4 1 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 -4 4 2 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 -4 5 2 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 0 42959 34676 925 925 -4 5 3 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 1 42959 34676 925 925 -5 1 0 6316 4737 3500 402 3817 3470 1925 1894 108 435 21 120 1561 21 0 0 1925 763 402 2842 0 6316 3054 485 485 -5 2 0 10995 8246 3500 434 10251 9319 2296 3298 321 530 32 172 4193 26 0 0 2296 2050 434 4948 0 10995 8201 580 580 -5 3 0 18432 13824 17916 2384 18787 17079 2797 5529 963 625 44 234 7685 31 0 0 2797 3757 2384 8294 0 18432 15029 675 675 -5 3 1 23855 17891 61144 8483 21316 19378 3297 7156 1386 685 55 276 8720 34 0 0 3297 4263 8483 10734 0 23855 17053 735 735 -5 4 1 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 -5 4 2 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 0 42959 34676 925 925 -5 5 2 63314 47486 90434 15239 90839 82581 6771 18994 4536 1000 128 549 37161 50 0 0 6771 18167 15239 28491 0 63314 72671 1050 1050 -5 5 3 63314 47486 90434 15239 90839 82581 6771 18994 4536 1000 128 549 37161 50 0 0 6771 18167 15239 28491 0 63314 72671 1050 1050 -6 1 0 10641 7980 3500 431 9016 8197 2255 3192 255 520 31 166 3688 26 0 0 2255 1803 431 4788 0 10641 7213 570 570 -6 2 0 16566 12424 3500 459 17504 15913 2701 4969 825 605 41 220 7161 30 0 0 2701 3500 459 7454 0 16566 14003 655 655 -6 3 0 23855 17891 61144 8483 21316 19378 3297 7156 1386 685 55 276 8720 34 0 0 3297 4263 8483 10734 0 23855 17053 735 735 -6 3 1 33286 24965 70977 10484 30649 27863 4005 9986 2138 780 73 350 12538 39 0 0 4005 6129 10484 14979 0 33286 24519 830 830 -6 4 1 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 0 42959 34676 925 925 -6 4 2 76699 57524 94641 16484 102862 93511 7456 23009 5040 1060 148 609 42080 53 0 0 7456 20572 16484 34514 0 76699 82289 1110 1110 +3 1 0 3280 2460 3500 366 1741 1583 1164 984 23 325 12 71 712 16 0 0 1164 348 366 1476 0 3280 1393 375 375 +3 2 0 9866 7399 3500 424 6042 5492 2180 2959 125 500 28 155 2471 25 0 0 2180 1208 424 4439 0 9866 4833 550 550 +3 3 0 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 +3 3 1 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 +3 4 1 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 +3 4 2 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 0 42959 34676 925 925 +4 1 0 8870 6652 3500 416 5182 4711 2074 2661 117 475 25 141 2119 23 0 0 2074 1036 416 3991 0 8870 4145 525 525 +4 2 0 18432 13824 17916 2384 18787 17079 2797 5529 963 625 44 234 7685 31 0 0 2797 3757 2384 8294 0 18432 15029 675 675 +4 3 0 30597 22947 67824 9826 26869 24426 3763 9179 1892 750 67 326 10992 37 0 0 3763 5373 9826 13768 0 30597 21495 800 800 +4 3 1 35980 26985 73759 11104 33891 30810 4277 10794 2397 810 79 375 13864 40 0 0 4277 6778 11105 16191 0 35980 27112 860 860 +4 4 1 42959 32219 79778 12501 43345 39404 4988 12887 3020 875 93 433 17732 43 0 0 4988 8669 12501 19331 0 42959 34676 925 925 +4 4 2 63314 47486 90434 15239 90839 82581 6771 18994 4536 1000 128 549 37161 50 0 0 6771 18167 15239 28491 0 63314 72671 1050 1050 +4 5 2 96450 72338 99480 18010 125485 114077 8397 28935 5760 1125 171 678 51335 56 0 0 8397 25097 18010 43402 0 96450 100388 1175 1175 +4 5 3 96450 72338 99480 18010 125485 114077 8397 28935 5760 1125 171 678 51335 56 0 0 8397 25097 18010 43402 1 96450 100388 1175 1175 +5 1 0 15567 11675 3500 455 16792 15266 2630 4670 757 595 40 214 6869 29 0 0 2630 3358 455 7005 0 15567 13434 645 645 +5 2 0 27286 20464 64275 9100 23724 21567 3536 8185 1614 715 60 298 9705 35 0 0 3536 4744 9100 12278 0 27286 18979 765 765 +5 3 0 35980 26985 73759 11104 33891 30810 4277 10794 2397 810 79 375 13864 40 0 0 4277 6778 11105 16191 0 35980 27112 860 860 +5 3 1 46599 34949 82732 13198 51864 47149 5300 13979 3341 905 100 460 21217 45 0 0 5300 10372 13198 20969 0 46599 41491 955 955 +5 4 1 63314 47486 90434 15239 90839 82581 6771 18994 4536 1000 128 549 37161 50 0 0 6771 18167 15239 28491 0 63314 72671 1050 1050 +5 4 2 76699 57524 94641 16484 102862 93511 7456 23009 5040 1060 148 609 42080 53 0 0 7456 20572 16484 34514 0 76699 82289 1110 1110 +5 5 2 96450 72338 99480 18010 125485 114077 8397 28935 5760 1125 171 678 51335 56 0 0 8397 25097 18010 43402 0 96450 100388 1175 1175 +5 5 3 96450 72338 99480 18010 125485 114077 8397 28935 5760 1125 171 678 51335 56 0 0 8397 25097 18010 43402 0 96450 100388 1175 1175 +6 1 0 25928 19446 62866 8811 22750 20682 3464 7778 1497 700 57 287 9307 35 0 0 3464 4550 8811 11667 0 25928 18200 750 750 +6 2 0 35980 26985 73759 11104 33891 30810 4277 10794 2397 810 79 375 13864 40 0 0 4277 6778 11105 16191 0 35980 27112 860 860 +6 3 0 46599 34949 82732 13198 51864 47149 5300 13979 3341 905 100 460 21217 45 0 0 5300 10372 13198 20969 0 46599 41491 955 955 +6 3 1 58317 43738 89040 14836 80526 73206 6411 17495 4263 980 122 530 32942 49 0 0 6411 16105 14836 26242 0 58317 64421 1030 1030 +6 4 1 76699 57524 94641 16484 102862 93511 7456 23009 5040 1060 148 609 42080 53 0 0 7456 20572 16484 34514 0 76699 82289 1110 1110 +6 4 2 106736 80052 101647 18739 136772 124338 8977 32020 6163 1155 183 711 55952 57 0 0 8977 27354 18739 48031 0 106736 109417 1205 1205 6 5 2 130300 97725 108714 21161 181168 164699 11434 39090 7833 1250 222 821 74114 62 0 0 11434 36233 21162 58635 0 130300 144935 1300 1300 6 5 3 130300 97725 108714 21161 181168 164699 11434 39090 7833 1250 222 821 74114 62 0 0 11434 36233 21162 58635 0 130300 144935 1300 1300 -7 1 0 16566 12424 3500 459 17504 15913 2701 4969 825 605 41 220 7161 30 0 0 2701 3500 459 7454 0 16566 14003 655 655 -7 2 0 24487 18365 61719 8592 21782 19801 3338 7346 1422 690 55 280 8910 34 0 0 3338 4356 8592 11019 0 24487 17425 740 740 -7 3 0 33286 24965 70977 10484 30649 27863 4005 9986 2138 780 73 350 12538 39 0 0 4005 6129 10484 14979 0 33286 24519 830 830 -7 3 1 48613 36460 84218 13555 57068 51880 5518 14584 3511 920 105 474 23346 46 0 0 5518 11413 13555 21876 0 48613 45655 970 970 -7 4 0 61047 45785 89732 15036 87705 79732 6574 18314 4400 990 125 539 35879 49 0 0 6574 17541 15036 27471 0 61047 70164 1040 1040 -7 4 1 76699 57524 94641 16484 102862 93511 7456 23009 5040 1060 148 609 42080 53 0 0 7456 20572 16484 34514 0 76699 82289 1110 1110 -7 4 2 137784 103338 111040 21969 212797 193452 12215 41335 8654 1280 236 858 87053 64 0 0 12215 42559 21969 62002 0 137784 170238 1330 1330 +7 1 0 34514 25886 72403 10798 32395 29450 4110 10354 2265 795 76 363 13252 39 0 0 4110 6479 10798 15531 0 34514 25916 845 845 +7 2 0 45222 33917 81844 12979 47587 43261 5190 13566 3231 895 98 451 19467 44 0 0 5190 9517 12979 20350 0 45222 38069 945 945 +7 3 0 58317 43738 89040 14836 80526 73206 6411 17495 4263 980 122 530 32942 49 0 0 6411 16105 14836 26242 0 58317 64421 1030 1030 +7 3 1 78071 58553 95149 16618 104055 94596 7537 23421 5089 1065 149 614 42568 53 0 0 7537 20811 16618 35132 0 78071 83244 1115 1115 +7 4 0 89681 67261 98244 17623 112847 102588 8155 26904 5576 1110 165 662 46164 55 0 0 8155 22569 17623 40356 0 89681 90277 1160 1160 +7 4 1 106736 80052 101647 18739 136772 124338 8977 32020 6163 1155 183 711 55952 57 0 0 8977 27354 18739 48031 0 106736 109417 1205 1205 +7 4 2 150603 112952 114867 23284 262769 238881 13493 45181 10144 1325 256 914 107496 66 0 0 13493 52553 23284 67771 0 150603 210215 1375 1375 7 5 2 226551 169913 131038 29012 438226 398387 23224 67965 20947 1500 344 1149 179274 75 0 0 23224 87645 29012 101948 0 226551 350580 1550 1550 7 5 3 226551 169913 131038 29012 438226 398387 23224 67965 20947 1500 344 1149 179274 75 0 0 23224 87645 29012 101948 0 226551 350580 1550 1550 -8 1 0 26356 19767 63125 8877 23029 20936 3481 7907 1536 705 58 291 9421 35 0 0 3481 4605 8877 11860 0 26356 18423 755 755 -8 2 0 35567 26675 73222 10989 33536 30487 4234 10670 2352 805 78 371 13719 40 0 0 4234 6707 10989 16005 0 35567 26829 855 855 -8 3 0 48613 36460 84218 13555 57068 51880 5518 14584 3511 920 105 474 23346 46 0 0 5518 11413 13555 21876 0 48613 45655 970 970 -8 3 1 86940 65205 97521 17378 111027 100933 7968 26082 5459 1100 161 651 45420 55 0 0 7968 22205 17378 39123 0 86940 88821 1150 1150 -8 4 1 137784 103338 111040 21969 212797 193452 12215 41335 8654 1280 236 858 87053 64 0 0 12215 42559 21969 62002 0 137784 170238 1330 1330 -8 4 2 235058 176293 132488 29552 455843 414402 23684 70517 22586 1515 352 1171 186481 75 0 0 23684 91168 29552 105776 0 235058 364674 1565 1565 +8 1 0 44142 33106 80959 12762 45522 41384 5091 13242 3124 885 95 442 18622 44 0 0 5091 9104 12762 19864 0 44142 36418 935 935 +8 2 0 58317 43738 89040 14836 80526 73206 6411 17495 4263 980 122 530 32942 49 0 0 6411 16105 14836 26242 0 58317 64421 1030 1030 +8 3 0 78071 58553 95149 16618 104055 94596 7537 23421 5089 1065 149 614 42568 53 0 0 7537 20811 16618 35132 0 78071 83244 1115 1115 +8 3 1 116593 87444 104633 19748 145568 132335 9760 34977 6783 1195 199 757 59550 59 0 0 9760 29113 19748 52466 0 116593 116455 1245 1245 +8 4 1 150603 112952 114867 23284 262769 238881 13493 45181 10144 1325 256 914 107496 66 0 0 13493 52553 23284 67771 0 150603 210215 1375 1375 +8 4 2 246400 184800 134217 30097 479332 435756 24276 73920 24827 1535 363 1199 196090 76 0 0 24276 95866 30097 110880 0 246400 383466 1585 1585 8 5 2 368329 276247 148589 33641 734594 667813 41132 110498 54836 1750 492 1532 300515 87 0 0 41132 146918 33641 165748 0 368329 587675 1800 1800 8 5 3 368329 276247 148589 33641 734594 667813 41132 110498 54836 1750 492 1532 300515 87 0 0 41132 146918 33641 165748 0 368329 587675 1800 1800 8 6 3 439218 329413 156371 37604 950173 863794 49644 131765 76856 1875 540 1732 388707 93 0 0 49644 190034 37604 197648 0 439218 760139 1925 1925 -9 1 0 37343 28007 75119 11416 34984 31803 4415 11203 2532 825 82 388 14311 41 0 0 4415 6996 11416 16804 0 37343 27987 875 875 -9 2 0 52708 39531 86693 14199 68476 62251 5956 15812 3872 950 113 502 28013 47 0 0 5956 13695 14199 23718 0 52708 54781 1000 1000 -9 3 0 86940 65205 97521 17378 111027 100933 7968 26082 5459 1100 161 651 45420 55 0 0 7968 22205 17378 39123 0 86940 88821 1150 1150 -9 3 1 144723 108542 113203 22705 240732 218847 12958 43417 9438 1305 247 889 98481 65 0 0 12958 48146 22705 65125 0 144723 192585 1355 1355 -9 4 1 235058 176293 132488 29552 455843 414402 23684 70517 22586 1515 352 1171 186481 75 0 0 23684 91168 29552 105776 0 235058 364674 1565 1565 -9 4 2 371165 278373 149024 33757 743217 675652 41486 111349 55692 1755 494 1539 304043 87 0 0 41486 148643 33757 167024 0 371165 594574 1805 1805 +9 1 0 59265 44448 89230 14909 82536 75032 6484 17779 4331 985 124 535 33764 49 0 0 6484 16507 14909 26669 0 59265 66028 1035 1035 +9 2 0 83193 62394 96587 17051 108060 98237 7787 24957 5294 1085 156 635 44206 54 0 0 7787 21612 17052 37436 0 83193 86448 1135 1135 +9 3 0 116593 87444 104633 19748 145568 132335 9760 34977 6783 1195 199 757 59550 59 0 0 9760 29113 19748 52466 0 116593 116455 1245 1245 +9 3 1 167735 125801 118492 24523 321431 292210 14882 50320 11809 1365 275 965 131494 68 0 0 14882 64286 24523 75480 0 167735 257145 1415 1415 +9 4 1 246400 184800 134217 30097 479332 435756 24276 73920 24827 1535 363 1199 196090 76 0 0 24276 95866 30097 110880 0 246400 383466 1585 1585 +9 4 2 376836 282627 149407 33844 760464 691330 42113 113050 57407 1765 497 1555 311098 88 0 0 42113 152092 33844 169576 0 376836 608371 1815 1815 9 5 2 510106 382580 163948 43073 1165753 1059775 84361 153032 100549 2000 591 1944 476899 100 0 0 84361 233150 43073 229548 0 510106 932602 2050 2050 9 5 3 510106 382580 163948 43073 1165753 1059775 84361 153032 100549 2000 591 1944 476899 100 0 0 84361 233150 43073 229548 0 510106 932602 2050 2050 9 6 3 705995 529496 171612 49486 1518805 1380731 102806 211798 126350 2125 643 2169 621329 106 0 0 102806 303761 49487 317698 0 705995 1215044 2175 2175 -10 1 0 57426 43070 88540 14710 78415 71287 6332 17228 4195 975 121 525 32079 48 0 0 6332 15683 14711 25842 0 57426 62732 1025 1025 -10 2 0 96450 72338 99480 18010 125485 114077 8397 28935 5760 1125 171 678 51335 56 0 0 8397 25097 18010 43402 0 96450 100388 1175 1175 -10 3 0 144723 108542 113203 22705 240732 218847 12958 43417 9438 1305 247 889 98481 65 0 0 12958 48146 22705 65125 0 144723 192585 1355 1355 -10 3 1 243565 182673 133782 29983 473460 430418 24153 73069 24260 1530 361 1192 193688 76 0 0 24153 94692 29983 109604 0 243565 378768 1580 1580 -10 4 1 371165 278373 149024 33757 743217 675652 41486 111349 55692 1755 494 1539 304043 87 0 0 41486 148643 33757 167024 0 371165 594574 1805 1805 -10 4 2 510106 382580 163948 43073 1165753 1059775 84361 153032 100549 2000 591 1944 476899 100 0 0 84361 233150 43073 229548 0 510106 932602 2050 2050 +10 1 0 88340 66255 98037 17528 111833 101666 8048 26502 5517 1105 163 656 45749 55 0 0 8048 22366 17528 39753 0 88340 89466 1155 1155 +10 2 0 123878 92908 106957 20528 163993 149085 10625 37163 7315 1225 212 792 67088 61 0 0 10625 32798 20528 55745 0 123878 131195 1275 1275 +10 3 0 167735 125801 118492 24523 321431 292210 14882 50320 11809 1365 275 965 131494 68 0 0 14882 64286 24523 75480 0 167735 257145 1415 1415 +10 3 1 263414 197560 136122 30573 514566 467787 25314 79024 28326 1565 380 1243 210504 78 0 0 25314 102913 30573 118536 0 263414 411653 1615 1615 +10 4 1 376836 282627 149407 33844 760464 691330 42113 113050 57407 1765 497 1555 311098 88 0 0 42113 152092 33844 169576 0 376836 608371 1815 1815 +10 4 2 517942 388456 163948 43092 1179875 1072613 85140 155382 101539 2005 593 1953 482676 100 0 0 85140 235975 43092 233074 0 517942 943900 2055 2055 10 5 2 901884 676413 178982 56179 1871857 1701688 126095 270565 154711 2250 697 2406 765759 112 0 0 126095 374371 56179 405847 0 901884 1497485 2300 2300 10 5 3 901884 676413 178982 56179 1871857 1701688 126095 270565 154711 2250 697 2406 765759 112 0 0 126095 374371 56179 405847 0 901884 1497485 2300 2300 10 6 3 1097773 823329 186395 63733 2293658 2085144 143779 329331 185621 2375 753 2655 938315 118 0 0 143779 458731 63733 493997 0 1097773 1834927 2425 2425 -11 1 0 105464 79098 101123 18583 135550 123228 8889 31639 6092 1150 181 706 55452 57 0 0 8889 27110 18583 47458 0 105464 108440 1200 1200 -11 2 0 150603 112952 114867 23284 262769 238881 13493 45181 10144 1325 256 914 107496 66 0 0 13493 52553 23284 67771 0 150603 210215 1375 1375 -11 3 0 243565 182673 133782 29983 473460 430418 24153 73069 24260 1530 361 1192 193688 76 0 0 24153 94692 29983 109604 0 243565 378768 1580 1580 -11 3 1 376836 282627 149407 33844 760464 691330 42113 113050 57407 1765 497 1555 311098 88 0 0 42113 152092 33844 169576 0 376836 608371 1815 1815 -11 4 1 510106 382580 163948 43073 1165753 1059775 84361 153032 100549 2000 591 1944 476899 100 0 0 84361 233150 43073 229548 0 510106 932602 2050 2050 +11 1 0 130300 97725 108714 21161 181168 164699 11434 39090 7833 1250 222 821 74114 62 0 0 11434 36233 21162 58635 0 130300 144935 1300 1300 +11 2 0 178968 134226 121031 25435 345413 314012 16234 53690 13318 1395 290 1005 141305 69 0 0 16234 69082 25436 80535 0 178968 276331 1445 1445 +11 3 0 263414 197560 136122 30573 514566 467787 25314 79024 28326 1565 380 1243 210504 78 0 0 25314 102913 30573 118536 0 263414 411653 1615 1615 +11 3 1 388178 291133 150555 34140 794956 722687 43610 116453 60860 1785 505 1586 325209 89 0 0 43610 158991 34140 174680 0 388178 635965 1835 1835 +11 4 1 517942 388456 163948 43092 1179875 1072613 85140 155382 101539 2005 593 1953 482676 100 0 0 85140 235975 43092 233074 0 517942 943900 2055 2055 11 4 2 901884 676413 178982 56179 1871857 1701688 126095 270565 154711 2250 697 2406 765759 112 0 0 126095 374371 56179 405847 0 901884 1497485 2300 2300 11 5 2 1293661 970246 194110 71646 2715460 2468600 167941 388098 219009 2500 811 2916 1110870 125 0 0 167941 543092 71646 582147 0 1293661 2172368 2550 2550 11 5 3 1293661 970246 194110 71646 2715460 2468600 167941 388098 219009 2500 811 2916 1110870 125 0 0 167941 543092 71646 582147 0 1293661 2172368 2550 2550 11 6 3 1489550 1117163 201580 80522 3137262 2852056 188068 446865 254194 2625 871 3189 1283425 131 0 0 188068 627452 80522 670297 0 1489550 2509810 2675 2675 -12 1 0 160315 120236 116515 23866 298828 271662 14103 48094 10932 1345 266 939 122248 67 0 0 14103 59765 23866 72142 0 160315 239062 1395 1395 -12 2 0 252071 189053 134727 30228 491077 446433 24630 75621 25975 1545 369 1214 200895 77 0 0 24630 98215 30228 113432 0 252071 392861 1595 1595 -12 3 0 376836 282627 149407 33844 760464 691330 42113 113050 57407 1765 497 1555 311098 88 0 0 42113 152092 33844 169576 0 376836 608371 1815 1815 -12 3 1 517942 388456 163948 43092 1179875 1072613 85140 155382 101539 2005 593 1953 482676 100 0 0 85140 235975 43092 233074 0 517942 943900 2055 2055 +12 1 0 187963 140972 123203 26227 363954 330868 17422 56388 14773 1420 302 1038 148890 71 0 0 17422 72790 26227 84583 0 187963 291163 1470 1470 +12 2 0 277591 208193 137620 30943 543928 494480 26147 83277 31382 1590 394 1281 222516 79 0 0 26147 108785 30943 124916 0 277591 435142 1640 1640 +12 3 0 388178 291133 150555 34140 794956 722687 43610 116453 60860 1785 505 1586 325209 89 0 0 43610 158991 34140 174680 0 388178 635965 1835 1835 +12 3 1 533613 400210 164585 43589 1208119 1098290 86309 160084 103528 2015 597 1971 494230 100 0 0 86309 241623 43589 240126 0 533613 966495 2065 2065 12 4 1 901884 676413 178982 56179 1871857 1701688 126095 270565 154711 2250 697 2406 765759 112 0 0 126095 374371 56179 405847 0 901884 1497485 2300 2300 12 4 2 1293661 970246 194110 71646 2715460 2468600 167941 388098 219009 2500 811 2916 1110870 125 0 0 167941 543092 71646 582147 0 1293661 2172368 2550 2550 12 5 2 1685439 1264079 208941 90270 3559064 3235513 216851 505631 291068 2750 933 3475 1455980 137 0 0 216851 711812 90270 758447 0 1685439 2847251 2800 2800 diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index b379f3c..7e0569a 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -78,62 +78,59 @@ 369 39 3 4|4 0 3_100000 0 0 107 10 370 46 4 0 0 3_100000 0 0 107 10 371 28 1 0 0 3_100000 0 0 107 10 -401 26 160 0 0 3_200000 0 0 108 10 -402 48 18 0 0 3_200000 0 0 108 10 -403 48 21 0 0 3_200000 0 0 108 10 -404 127 8 2 0 3_200000 0 0 108 10 -405 2 80 0 0 3_200000 0 0 108 10 -406 58 1 50106001|15 0 3_200000 0 0 108 10 -407 42 1 308 0 3_200000 0 0 108 10 -408 128 2 0 0 3_200000 0 0 108 10 -421 50 6 0 0 3_200000 0 0 108 10 -422 91 5 50005|55005|60005 0 3_200000 0 0 108 10 -423 91 5 50105|55105|60105 0 3_200000 0 0 108 10 -424 91 5 50405|55405|60405 0 3_200000 0 0 108 10 -425 121 1 0 0 3_200000 0 0 108 10 -426 121 2 0 0 3_200000 0 0 108 10 -427 58 1 50106001|20 0 3_200000 0 0 108 10 -428 127 4 3 0 3_200000 0 0 108 10 -429 10 1 100|15 0 3_200000 0 0 108 10 -430 10 1 100|20 0 3_200000 0 0 108 10 -431 10 1 201|4 0 3_200000 0 0 108 10 -432 5 40 0 0 3_200000 0 0 108 10 -433 4 8 0 0 3_200000 0 0 108 10 -434 7 8 0 0 3_200000 0 0 108 10 -435 69 1 3711|3721 0 3_200000 0 0 108 10 -436 111 1 0 0 3_200000 0 0 108 10 -437 39 5 4|4 0 3_200000 0 0 108 10 -438 28 2 0 0 3_200000 0 0 108 10 -439 128 4 0 0 3_200000 0 0 108 10 -440 91 5 1005|2005|3005 0 3_200000 0 0 108 10 -441 91 5 50205|55205|60205 0 3_200000 0 0 108 10 -442 127 8 3 0 3_200000 0 0 108 10 -443 127 12 3 0 3_200000 0 0 108 10 -444 46 6 0 0 3_200000 0 0 108 10 -445 62 1 6 0 3_200000 0 0 108 10 -446 48 24 0 0 3_200000 0 0 108 10 -447 36 1 60203009 0 3_200000 0 0 108 10 -448 10 1 201|10 0 3_200000 0 0 108 10 -449 26 180 0 0 3_200000 0 0 108 10 -461 50 7 0 0 3_200000 0 0 108 10 -462 26 200 0 0 3_200000 0 0 108 10 -463 42 1 408 0 3_200000 0 0 108 10 -464 46 10 0 0 3_200000 0 0 108 10 -465 69 1 4004 0 3_200000 0 0 108 10 -466 125 2 0 0 3_200000 0 0 108 10 -467 70 1 2 0 3_200000 0 0 108 10 -468 71 1 2 0 3_200000 0 0 108 10 -469 49 1 4 0 3_200000 0 0 108 10 -470 54 1 1|1|3 0 3_200000 0 0 108 10 -471 39 1 5|4 0 3_200000 0 0 108 10 -472 33 1 307|0 0 3_200000 0 0 108 10 -473 111 3 0 0 3_200000 0 0 108 10 -474 42 1 404 0 3_200000 0 0 108 10 -475 46 8 0 0 3_200000 0 0 108 10 -476 128 6 0 0 3_200000 0 0 108 10 -477 91 5 50305|55305|60305 0 3_200000 0 0 108 10 -478 91 5 50505|55505|60505 0 3_200000 0 0 108 10 -479 28 4 0 0 3_200000 0 0 108 10 +401 26 160 0 0 3_100000 0 0 108 10 +402 48 18 0 0 3_100000 0 0 108 10 +403 48 21 0 0 3_100000 0 0 108 10 +404 127 8 2 0 3_100000 0 0 108 10 +405 2 80 0 0 3_100000 0 0 108 10 +406 58 1 50106001|15 0 3_100000 0 0 108 10 +407 42 1 308 0 3_100000 0 0 108 10 +408 128 2 0 0 3_100000 0 0 108 10 +421 50 6 0 0 3_100000 0 0 108 10 +422 91 5 50005|55005|60005 0 3_100000 0 0 108 10 +423 91 5 50105|55105|60105 0 3_100000 0 0 108 10 +424 91 5 50405|55405|60405 0 3_100000 0 0 108 10 +425 121 1 0 0 3_100000 0 0 108 10 +426 121 2 0 0 3_100000 0 0 108 10 +427 58 1 50106001|20 0 3_100000 0 0 108 10 +428 127 4 3 0 3_100000 0 0 108 10 +429 10 1 100|15 0 3_100000 0 0 108 10 +430 10 1 100|20 0 3_100000 0 0 108 10 +431 10 1 201|4 0 3_100000 0 0 108 10 +432 5 40 0 0 3_100000 0 0 108 10 +433 4 8 0 0 3_100000 0 0 108 10 +434 7 8 0 0 3_100000 0 0 108 10 +435 69 1 3711|3721 0 3_100000 0 0 108 10 +437 39 5 4|4 0 3_100000 0 0 108 10 +438 28 2 0 0 3_100000 0 0 108 10 +439 128 4 0 0 3_100000 0 0 108 10 +440 91 5 1005|2005|3005 0 3_100000 0 0 108 10 +441 91 5 50205|55205|60205 0 3_100000 0 0 108 10 +442 127 8 3 0 3_100000 0 0 108 10 +443 127 12 3 0 3_100000 0 0 108 10 +444 46 6 0 0 3_100000 0 0 108 10 +445 62 1 6 0 3_100000 0 0 108 10 +446 48 24 0 0 3_100000 0 0 108 10 +447 36 1 60203009 0 3_100000 0 0 108 10 +448 10 1 201|10 0 3_100000 0 0 108 10 +449 26 180 0 0 3_100000 0 0 108 10 +461 50 7 0 0 3_100000 0 0 108 10 +462 26 200 0 0 3_100000 0 0 108 10 +464 46 8 0 0 3_100000 0 0 108 10 +465 69 1 4004 0 3_100000 0 0 108 10 +466 125 2 0 0 3_100000 0 0 108 10 +467 70 1 2 0 3_100000 0 0 108 10 +468 71 1 2 0 3_100000 0 0 108 10 +469 49 1 4 0 3_100000 0 0 108 10 +470 54 1 1|1|3 0 3_100000 0 0 108 10 +471 39 1 5|3 0 3_100000 0 0 108 10 +472 33 1 307|0 0 3_100000 0 0 108 10 +474 42 1 404 0 3_100000 0 0 108 10 +475 46 10 0 0 3_100000 0 0 108 10 +476 128 6 0 0 3_100000 0 0 108 10 +477 91 5 50305|55305|60305 0 3_100000 0 0 108 10 +478 91 5 50505|55505|60505 0 3_100000 0 0 108 10 +479 28 4 0 0 3_100000 0 0 108 10 501 50 8 0 0 3_200000 0 0 109 10 502 116 20 5012|5022 0 3_200000 0 0 109 10 503 26 220 0 0 3_200000 0 0 109 10 @@ -143,6 +140,8 @@ 507 69 1 4007 0 3_200000 0 0 109 10 508 58 1 50106102|4 0 3_200000 0 0 109 10 509 46 12 0 0 3_200000 0 0 109 10 +510 42 1 408 0 3_100000 0 0 109 10 +511 111 1 0 0 3_100000 0 0 109 10 521 50 9 0 0 3_200000 0 0 109 10 522 125 6 0 0 3_200000 0 0 109 10 523 125 8 0 0 3_200000 0 0 109 10 diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt index 7f9c342..7d561ab 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt @@ -24,14 +24,14 @@ 107 4 130 50500|55500|60500 108 0 0 108 1 80 6_15000 -108 2 130 6 -108 3 160 5 -108 4 190 50600|55600|60600 +108 2 120 6 +108 3 150 5 +108 4 180 50600|55600|60600 109 0 0 109 1 90 7_500 109 2 120 7 -109 3 140 8 -109 4 160 50700|55700|60700 +109 3 150 8 +109 4 170 50700|55700|60700 110 0 0 110 1 70 6_20000 110 2 150 10 -- Gitblit v1.8.0