From 3dd84a09cc7e88aa0edba81e288f776950921ca7 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 15 十月 2018 20:07:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 162 +++++++++++++++++++++++++++---------------------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4
2 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 7c7f32b..2ade18b 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -17,87 +17,87 @@
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 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
+3 1 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
+3 2 0 3500 2625 3500 374 1874 1703 1195 1050 48 350 14 81 766 17 0 0 1195 374 374 1575 0 3500 1499 400 400
+3 3 0 7271 5453 3500 407 4305 3914 1989 2181 111 450 23 128 1761 22 0 0 1989 861 407 3272 0 7271 3444 500 500
+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 16130 12097 3500 457 17175 15613 2674 4839 791 600 41 217 7026 30 0 0 2674 3435 457 7258 0 16130 13740 650 650
+3 4 2 16130 12097 3500 457 17175 15613 2674 4839 791 600 41 217 7026 30 0 0 2674 3435 457 7258 0 16130 13740 650 650
+4 1 0 3375 2531 3500 371 1793 1630 1175 1012 38 340 13 77 733 17 0 0 1175 358 371 1519 0 3375 1434 390 390
+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 10801 8101 3500 432 9732 8847 2274 3240 288 525 31 169 3981 26 0 0 2274 1946 432 4860 0 10801 7785 575 575
+4 3 1 16130 12097 3500 457 17175 15613 2674 4839 791 600 41 217 7026 30 0 0 2674 3435 457 7258 0 16130 13740 650 650
+4 4 1 16130 12097 3500 457 17175 15613 2674 4839 791 600 41 217 7026 30 0 0 2674 3435 457 7258 0 16130 13740 650 650
+4 4 2 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
+4 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
+4 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
+5 1 0 4795 3596 3500 396 2920 2654 1423 1438 104 415 19 110 1194 20 0 0 1423 584 396 2158 0 4795 2336 465 465
+5 2 0 9595 7196 3500 422 5808 5280 2144 2878 122 495 28 152 2376 24 0 0 2144 1161 422 4318 0 9595 4646 545 545
+5 3 0 12815 9611 3500 444 13745 12495 2459 3844 521 560 35 191 5622 28 0 0 2459 2749 444 5766 0 12815 10996 610 610
+5 3 1 16130 12097 3500 457 17175 15613 2674 4839 791 600 41 217 7026 30 0 0 2674 3435 457 7258 0 16130 13740 650 650
+5 4 1 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
+5 4 2 46046 34534 82136 13064 50092 45538 5247 13813 3286 900 99 456 20492 45 0 0 5247 10018 13064 20720 0 46046 40074 950 950
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 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 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
+5 5 3 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+6 1 0 9211 6908 3500 419 5477 4979 2104 2763 119 485 27 146 2240 24 0 0 2104 1095 419 4145 0 9211 4382 535 535
+6 2 0 12815 9611 3500 444 13745 12495 2459 3844 521 560 35 191 5622 28 0 0 2459 2749 444 5766 0 12815 10996 610 610
+6 3 0 18927 14195 21817 2913 19041 17310 2838 5678 998 630 45 237 7789 31 0 0 2838 3808 2913 8517 0 18927 15233 680 680
+6 3 1 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 4 1 46046 34534 82136 13064 50092 45538 5247 13813 3286 900 99 456 20492 45 0 0 5247 10018 13064 20720 0 46046 40074 950 950
+6 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
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 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 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 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 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 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
-8 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
-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 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
-9 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
-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 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
-10 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
-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 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
-11 6 3 1881328 1410996 216718 99977 3980866 3618969 201932 564398 330998 2875 997 3772 1628536 143 0 0 201932 796173 99977 846597 0 1881328 3184693 2925 2925
-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
-12 5 3 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
-12 6 3 1881328 1410996 216718 99977 3980866 3618969 201932 564398 330998 2875 997 3772 1628536 143 0 0 201932 796173 99977 846597 0 1881328 3184693 2925 2925
+7 1 0 13587 10190 3500 447 14986 13624 2499 4076 588 570 37 197 6131 28 0 0 2499 2997 447 6114 0 13587 11989 620 620
+7 2 0 22199 16649 46440 6333 20995 19086 3102 6659 1208 660 50 258 8589 33 0 0 3102 4199 6333 9989 0 22199 16796 710 710
+7 3 0 31971 23978 69246 10131 28796 26178 3900 9591 2014 765 70 338 11780 38 0 0 3900 5759 10131 14387 0 31971 23036 815 815
+7 3 1 46046 34534 82136 13064 50092 45538 5247 13813 3286 900 99 456 20492 45 0 0 5247 10018 13064 20720 0 46046 40074 950 950
+7 4 0 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
+7 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
+7 4 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
+7 5 2 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+7 5 3 297440 223080 140086 31548 585034 531849 27602 89232 35901 1625 415 1333 239332 81 0 0 27602 117006 31548 133848 0 297440 468027 1675 1675
+8 1 0 23331 17498 55504 7622 21644 19676 3184 6999 1279 670 52 265 8854 33 0 0 3184 4328 7622 10499 0 23331 17315 720 720
+8 2 0 32488 24366 69819 10247 29446 26769 3940 9746 2055 770 71 342 12046 38 0 0 3940 5889 10247 14619 0 32488 23557 820 820
+8 3 0 43627 32720 80368 12631 44404 40368 5044 13088 3072 880 94 438 18165 44 0 0 5044 8880 12631 19632 0 43627 35523 930 930
+8 3 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
+8 4 1 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
+8 4 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
+8 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
+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 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 1 0 32898 24673 70400 10366 30067 27334 3970 9869 2096 775 72 346 12300 38 0 0 3970 6013 10366 14804 0 32898 24054 825 825
+9 2 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
+9 3 0 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
+9 3 1 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
+9 4 1 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
+9 4 2 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+9 5 2 297440 223080 140086 31548 585034 531849 27602 89232 35901 1625 415 1333 239332 81 0 0 27602 117006 31548 133848 0 297440 468027 1675 1675
+9 5 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 6 3 784351 588263 174626 52235 1660025 1509114 112209 235305 137367 2175 665 2262 679101 108 0 0 112209 332005 52235 352957 0 784351 1328020 2225 2225
+10 1 0 44649 33487 81250 12847 46584 42349 5138 13394 3177 890 97 447 19057 44 0 0 5138 9316 12847 20092 0 44649 37267 940 940
+10 2 0 64170 48127 90939 15367 91711 83374 6826 19251 4573 1005 130 554 37518 50 0 0 6826 18342 15367 28876 0 64170 73369 1055 1055
+10 3 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 1 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
+10 4 1 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+10 4 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
+10 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
+10 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
+10 6 3 1058595 793946 185061 62092 2209298 2008453 139800 317578 179250 2350 742 2604 903803 117 0 0 139800 441859 62092 476367 0 1058595 1767438 2400 2400
+11 1 0 64170 48127 90939 15367 91711 83374 6826 19251 4573 1005 130 554 37518 50 0 0 6826 18342 15367 28876 0 64170 73369 1055 1055
+11 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
+11 3 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 3 1 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+11 4 1 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
+11 4 2 297440 223080 140086 31548 585034 531849 27602 89232 35901 1625 415 1333 239332 81 0 0 27602 117006 31548 133848 0 297440 468027 1675 1675
+11 5 2 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
+11 5 3 784351 588263 174626 52235 1660025 1509114 112209 235305 137367 2175 665 2262 679101 108 0 0 112209 332005 52235 352957 0 784351 1328020 2225 2225
+11 6 3 1332839 999629 195613 73692 2799821 2545291 171275 399851 225962 2525 823 2970 1145381 126 0 0 171275 559964 73692 599777 0 1332839 2239856 2575 2575
+12 1 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
+12 2 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
+12 3 0 171693 128770 119327 24823 330100 300091 15340 51508 12285 1375 280 978 135040 68 0 0 15340 66020 24823 77262 0 171693 264080 1425 1425
+12 3 1 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
+12 4 1 297440 223080 140086 31548 585034 531849 27602 89232 35901 1625 415 1333 239332 81 0 0 27602 117006 31548 133848 0 297440 468027 1675 1675
+12 4 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
+12 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
+12 5 3 1058595 793946 185061 62092 2209298 2008453 139800 317578 179250 2350 742 2604 903803 117 0 0 139800 441859 62092 476367 0 1058595 1767438 2400 2400
+12 6 3 1607083 1205312 206260 86324 3390343 3082130 201652 482125 275997 2700 908 3359 1386958 135 0 0 201652 678068 86325 723187 0 1607083 2712275 2750 2750
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 789f925..ca9dd35 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -77,7 +77,7 @@
ExpAttenuation max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1) 0 0 0 0
AtkInterval int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5)) 0 0 0 0
MoveSpeed max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100) 50 25 0 0
-FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*10+FinalHurtReduce*10+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*10.0+PVPAtkBackHP*20.0+NPCHurtAddPer/10000.0*240000)) int(min(LV,1)*(MinAtk*12+MaxAtk*12+MaxHP*6/10.0+Def*12)) 0 0 0
+FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*10+FinalHurtReduce*10+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*10.0+PVPAtkBackHP*20.0+NPCHurtAddPer/10000.0*240000)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
@@ -166,7 +166,7 @@
LegendAttrValueByColor2 {30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}
LegendAttrValueByClassLV {29:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:2000,9:3000,10:4000,11:4400,12:4750,13:5000,14:5250},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:2000,9:3000,10:4000,11:4400,12:4750,13:5000,14:5250},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123 0 0 0 0
-EquipGSFormula int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0) 0 0
+EquipGSFormula int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0) 0 0
HorseUpItem 181 100 0 0 0
HorseSuperRate {} 0 0 0 0
NeedSysHorseLV {100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}
--
Gitblit v1.8.0