From fa7bf5cf74926c35a11c25ffc3abe48c68ecdada Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 26 九月 2018 21:13:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 4
db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt | 22 +-
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 2
db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt | 197 +++++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
db/PyMongoDataServer/PySysDB/tagLVAward.txt | 10
db/PyMongoDataServer/PySysDB/tagTalentSkill.txt | 61 ++++++++++
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0
19 files changed, 192 insertions(+), 117 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 699b57d..0b094dd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -302,7 +302,7 @@
50106311 海牛侍卫 441
50106312 雷震子 1
50106313 极炎剑客 1
-50106314 双头火狼 1
+50106314 阴雷之狼 1
50106315 雷蛟 441
50105001 傲世神驹 1
50105002 枪元素 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 8bc198b..fd610b0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -40,7 +40,7 @@
87 0 30101 0
88 105 0 0
89 110 0 0
-90 170 0 0
+90 175 0 0
91 180 0 0
92 205 0 0
93 240 0 0
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 7da4de7..ec79bf5 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index eb03cb9..b129365 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 94c4829..78d1e54 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
index 56a5a0c..9b70235 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 8f886df..524f4e8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index 4aeda38..7abd2a2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 1162703..38504a0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.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 06cdc16..687d502 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/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index c8026af..885e404 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -3,7 +3,7 @@
2201 0 106_1|105_1|104_4 0 0
2202 0 4305_8 0 0
2203 0 5303_100 0 0
-2204 0 153_30|144_60|143_80 152_1 0 0
+2204 0 153_15|144_30|143_45|142_60|141_80 147_1 0 0
2205 0 5011_1|5012_1|5013_1|5014_1|5015_1 [[5011,5021,5031],[5012,5022,5032],[5013,5023,5033],[5014,5024,5034],[5015,5025,5035]] 0 0
2206 0 6_1 0 0
2301 0 4151_10 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 33a7c5f..cb73875 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -1,92 +1,105 @@
-EquipClass EquipColor EquipStar AtkPerC DamagePerC SuperHitRateC SuperHitPerC DamReduceC MaxHPPerC DefPerC LuckyHitRateC PetDamPerC PerLVAtkC MissRateC HitRateC DamBackPerC PerLVMaxHPC DropEquipPerC DropMoneyPerC IgnoreDefRateReduceC DamChanceDefC SuperHitReduceC SkillAtkRateC SpeedPerC AtkSpeedC SkillAtkRateReduceC
-0 1 0 490 367 3500 350 236 214 155 147 0 50 0 3 96 2 0 0 155 47 350 220 0 490 188
-0 3 0 28999 21749 64639 9365 26987 24533 3694 8699 1913 750 49 326 11040 37 0 0 3694 5397 9365 13049 0 28999 21589
-1 1 0 920 690 3500 350 475 432 335 276 0 100 1 10 194 5 0 0 335 95 350 414 0 920 380
-1 2 0 1187 890 3500 350 725 659 453 356 0 150 2 18 296 7 0 0 453 145 350 534 0 1187 580
-1 5 2 8617 6463 3500 424 5921 5383 2058 2585 126 500 20 155 2422 25 0 0 2058 1184 424 3877 0 8617 4737
-2 1 0 1187 890 3500 350 725 659 453 356 0 150 2 18 296 7 0 0 453 145 350 534 0 1187 580
-2 2 0 2163 1622 3500 350 1276 1160 729 649 0 250 5 44 522 12 0 0 729 255 350 973 0 2163 1021
-2 3 0 3532 2649 3500 391 2614 2376 1252 1059 101 400 13 103 1069 20 0 0 1252 522 391 1589 0 3532 2091
-3 1 0 2187 1640 3500 350 1311 1191 736 656 0 260 5 47 536 13 0 0 736 262 350 984 0 2187 1048
-3 2 0 3118 2338 3500 383 2206 2005 1149 935 73 375 11 91 902 18 0 0 1149 441 383 1403 0 3118 1764
-3 3 0 8617 6463 3500 424 5921 5383 2058 2585 126 500 20 155 2422 25 0 0 2058 1184 424 3877 0 8617 4737
-3 3 1 8617 6463 3500 424 5921 5383 2058 2585 126 500 20 155 2422 25 0 0 2058 1184 424 3877 0 8617 4737
-3 4 1 16958 12718 17916 2384 18734 17031 2681 5087 970 625 32 234 7664 31 0 0 2681 3746 2384 7631 0 16958 14987
-3 4 2 28999 21749 64639 9365 26987 24533 3694 8699 1913 750 49 326 11040 37 0 0 3694 5397 9365 13049 0 28999 21589
-4 1 0 2859 2144 3500 378 1994 1813 1106 857 57 360 10 85 815 18 0 0 1106 398 378 1286 0 2859 1595
-4 2 0 7126 5344 3500 412 4803 4367 1922 2137 114 465 17 135 1965 23 0 0 1922 960 412 3206 0 7126 3843
-4 3 0 11437 8578 3500 444 13584 12349 2331 3431 524 560 25 191 5557 28 0 0 2331 2716 444 5146 0 11437 10867
-4 3 1 16958 12718 17916 2384 18734 17031 2681 5087 970 625 32 234 7664 31 0 0 2681 3746 2384 7631 0 16958 14987
-4 4 1 28999 21749 64639 9365 26987 24533 3694 8699 1913 750 49 326 11040 37 0 0 3694 5397 9365 13049 0 28999 21589
-4 4 2 28999 21749 64639 9365 26987 24533 3694 8699 1913 750 49 326 11040 37 0 0 3694 5397 9365 13049 0 28999 21589
-4 5 2 41153 30864 72491 11359 43468 39517 4856 12345 3068 875 69 433 17782 43 0 0 4856 8693 11359 18518 0 41153 34775
-5 1 0 6253 4690 3500 407 4312 3920 1868 1876 111 450 16 128 1764 22 0 0 1868 862 407 2814 0 6253 3449
-5 2 0 9998 7499 3500 437 11088 10080 2210 2999 390 540 23 179 4536 27 0 0 2210 2217 437 4499 0 9998 8870
-5 3 0 16520 12390 14214 1884 18482 16802 2656 4956 935 620 31 230 7560 31 0 0 2656 3696 1884 7434 0 16520 14785
-5 3 1 22346 16759 59897 8310 21378 19434 3202 6703 1398 685 39 276 8745 34 0 0 3202 4275 8310 10055 0 22346 17102
-5 4 1 28999 21749 64639 9365 26987 24533 3694 8699 1913 750 49 326 11040 37 0 0 3694 5397 9365 13049 0 28999 21589
-5 4 2 41153 30864 72491 11359 43468 39517 4856 12345 3068 875 69 433 17782 43 0 0 4856 8693 11359 18518 0 41153 34775
-5 5 2 57739 43304 80035 13486 87445 79495 6553 17321 4640 1000 97 549 35772 50 0 0 6553 17489 13487 25982 0 57739 69956
-5 5 3 57739 43304 80035 13486 87445 79495 6553 17321 4640 1000 97 549 35772 50 0 0 6553 17489 13487 25982 0 57739 69956
-6 1 0 9833 7374 3500 435 10591 9629 2191 2949 357 535 23 175 4333 26 0 0 2191 2118 435 4424 0 9833 8473
-6 2 0 16520 12390 14214 1884 18482 16802 2656 4956 935 620 31 230 7560 31 0 0 2656 3696 1884 7434 0 16520 14785
-6 3 0 24393 18294 61143 8569 22809 20735 3376 7317 1510 700 42 287 9330 35 0 0 3376 4561 8569 10976 0 24393 18247
-6 3 1 31599 23699 66797 9867 30707 27915 3916 9479 2163 780 53 350 12562 39 0 0 3916 6141 9867 14219 0 31599 24565
-6 4 1 41153 30864 72491 11359 43468 39517 4856 12345 3068 875 69 433 17782 43 0 0 4856 8693 11359 18518 0 41153 34775
-6 4 2 69389 52041 83757 14589 98262 89329 7186 20816 5170 1060 112 609 40198 53 0 0 7186 19652 14589 31225 0 69389 78610
-6 5 2 115724 86793 96161 18718 169897 154452 10883 34717 8113 1250 174 821 69503 62 0 0 10883 33979 18718 52076 0 115724 135918
-6 5 3 115724 86793 96161 18718 169897 154452 10883 34717 8113 1250 174 821 69503 62 0 0 10883 33979 18718 52076 0 115724 135918
-7 1 0 16958 12718 17916 2384 18734 17031 2681 5087 970 625 32 234 7664 31 0 0 2681 3746 2384 7631 0 16958 14987
-7 2 0 25739 19304 62071 8788 23811 21646 3461 7721 1629 715 44 298 9740 35 0 0 3461 4762 8788 11582 0 25739 19049
-7 3 0 34355 25766 68647 10335 34019 30927 4187 10306 2428 810 58 375 13917 40 0 0 4187 6803 10335 15460 0 34355 27215
-7 3 1 45927 34445 75318 12122 56393 51266 5347 13778 3575 920 78 474 23069 46 0 0 5347 11278 12122 20667 0 45927 45114
-7 4 0 55721 41791 79417 13307 84666 76969 6344 16716 4499 990 94 539 34636 49 0 0 6344 16933 13307 25074 0 55721 67733
-7 4 1 69389 52041 83757 14589 98262 89329 7186 20816 5170 1060 112 609 40198 53 0 0 7186 19652 14589 31225 0 69389 78610
-7 4 2 121941 91456 98204 19429 199618 181471 11652 36582 8979 1280 185 858 81662 64 0 0 11652 39923 19430 54873 0 121941 159694
-7 5 2 204018 153013 116049 25693 412516 375014 21864 61205 21943 1500 274 1149 168756 75 0 0 21864 82503 25693 91808 0 204018 330012
-7 5 3 204018 153013 116049 25693 412516 375014 21864 61205 21943 1500 274 1149 168756 75 0 0 21864 82503 25693 91808 0 204018 330012
-8 1 0 26983 20237 63305 9052 24856 22596 3559 8095 1749 730 46 310 10168 36 0 0 3559 4971 9052 12142 0 26983 19884
-8 2 0 36526 27394 70095 10718 35902 32638 4391 10957 2662 835 62 397 14687 41 0 0 4391 7180 10719 16436 0 36526 28722
-8 3 0 49697 37272 77339 12703 68544 62312 5846 14909 4015 955 86 506 28040 47 0 0 5846 13708 12703 22363 0 49697 54835
-8 3 1 78007 58505 86300 15378 105335 95759 7634 23402 5612 1100 123 651 43091 55 0 0 7634 21067 15378 35103 0 78007 84268
-8 4 1 121941 91456 98204 19429 199618 181471 11652 36582 8979 1280 185 858 81662 64 0 0 11652 39923 19430 54873 0 121941 159694
-8 4 2 212525 159393 117350 26176 430133 391030 22314 63757 23672 1515 281 1171 175963 75 0 0 22314 86026 26176 95636 0 212525 344106
-8 5 2 345795 259346 131827 29846 708884 644440 38543 103738 57718 1750 397 1532 289998 87 0 0 38543 141776 29846 155608 0 345795 567107
-8 5 3 345795 259346 131827 29846 708884 644440 38543 103738 57718 1750 397 1532 289998 87 0 0 38543 141776 29846 155608 0 345795 567107
-8 6 3 416684 312513 138484 31503 924463 840421 45590 125005 80986 1875 432 1732 378189 93 0 0 45590 184892 31503 187507 0 416684 739571
-9 1 0 38649 28987 71441 11059 38227 34752 4679 11594 2860 855 65 415 15638 42 0 0 4679 7645 11059 17392 0 38649 30582
-9 2 0 53441 40081 78839 13136 77770 70700 6201 16032 4356 980 92 530 31815 49 0 0 6201 15554 13136 24048 0 53441 62216
-9 3 0 88055 66041 88212 16022 120223 109294 8143 26416 5996 1130 133 683 49182 56 0 0 8143 24044 16022 39624 0 88055 96179
-9 3 1 127674 95755 100115 20080 225876 205342 12286 38302 9805 1305 194 889 92403 65 0 0 12286 45175 20080 57453 0 127674 180701
-9 4 1 212525 159393 117350 26176 430133 391030 22314 63757 23672 1515 281 1171 175963 75 0 0 22314 86026 26176 95636 0 212525 344106
-9 4 2 348631 261473 132237 29954 717507 652279 38942 104589 58622 1755 399 1539 293525 87 0 0 38942 143501 29955 156884 0 348631 574006
-9 5 2 487573 365680 144621 33656 1140043 1036402 76313 146272 106032 2000 468 1944 466381 100 0 0 76313 228008 33657 219408 0 487573 912034
-9 5 3 487573 365680 144621 33656 1140043 1036402 76313 146272 106032 2000 468 1944 466381 100 0 0 76313 228008 33657 219408 0 487573 912034
-9 6 3 683462 512596 150592 35895 1493095 1357359 92368 205038 133316 2125 505 2169 610811 106 0 0 92368 298619 35895 307557 0 683462 1194476
-10 1 0 58461 43845 80499 13603 88346 80315 6597 17538 4679 1005 98 554 36141 50 0 0 6597 17669 13603 26307 0 58461 70677
-10 2 0 95734 71800 89973 16587 129385 117623 8567 28720 6353 1155 141 711 52930 57 0 0 8567 25877 16587 43080 0 95734 103508
-10 3 0 135816 101862 102083 20740 257388 233989 12917 40745 10749 1330 204 920 105295 66 0 0 12917 51477 20741 61117 0 135816 205910
-10 3 1 221031 165773 118514 26561 447750 407045 22842 66309 25439 1530 288 1192 183170 76 0 0 22842 89550 26561 99464 0 221031 358200
-10 4 1 348631 261473 132237 29954 717507 652279 38942 104589 58622 1755 399 1539 293525 87 0 0 38942 143501 29955 156884 0 348631 574006
-10 4 2 487573 365680 144621 33656 1140043 1036402 76313 146272 106032 2000 468 1944 466381 100 0 0 76313 228008 33657 219408 0 487573 912034
-10 5 2 879350 659513 156269 38111 1846147 1678315 112564 263805 163319 2250 542 2406 755241 112 0 0 112564 369229 38111 395707 0 879350 1476917
-10 5 3 879350 659513 156269 38111 1846147 1678315 112564 263805 163319 2250 542 2406 755241 112 0 0 112564 369229 38111 395707 0 879350 1476917
-10 6 3 1075239 806429 161734 40259 2267948 2061771 127507 322571 196048 2375 581 2655 927797 118 0 0 127507 453589 40259 483857 0 1075239 1814359
-11 1 0 100134 75100 91287 17035 133402 121275 8917 30040 6667 1175 148 734 54573 58 0 0 8917 26680 17035 45060 0 100134 106722
-11 2 0 142789 107092 103511 21251 286611 260556 13463 42836 11602 1350 211 946 117250 67 0 0 13463 57322 21251 64255 0 142789 229289
-11 3 0 229538 172153 119368 26782 465367 423061 23283 68861 27248 1545 295 1214 190377 77 0 0 23283 93073 26782 103292 0 229538 372293
-11 3 1 354302 265726 132620 30041 734754 667958 39334 106290 60435 1765 401 1555 300581 88 0 0 39334 146950 30041 159436 0 354302 587803
-11 4 1 487573 365680 144621 33656 1140043 1036402 76313 146272 106032 2000 468 1944 466381 100 0 0 76313 228008 33657 219408 0 487573 912034
-11 4 2 879350 659513 156269 38111 1846147 1678315 112564 263805 163319 2250 542 2406 755241 112 0 0 112564 369229 38111 395707 0 879350 1476917
-11 5 2 1271128 953346 167352 42059 2689750 2445227 148780 381338 231450 2500 620 2916 1100352 125 0 0 148780 537950 42059 572007 0 1271128 2151800
-11 5 3 1271128 953346 167352 42059 2689750 2445227 148780 381338 231450 2500 620 2916 1100352 125 0 0 148780 537950 42059 572007 0 1271128 2151800
-11 6 3 1467017 1100262 172657 44221 3111552 2828684 165446 440105 268806 2625 661 3189 1272907 131 0 0 165446 622310 44222 660157 0 1467017 2489242
-12 1 0 147995 110996 104758 21681 301836 274397 14109 44398 12306 1365 217 965 123478 68 0 0 14109 60367 21681 66597 0 147995 241469
-12 2 0 238044 178533 120236 26991 482984 439076 23793 71413 29101 1560 302 1236 197584 78 0 0 23793 96596 26991 107120 0 238044 386387
-12 3 0 359973 269980 133386 30231 752000 683636 39841 107992 62254 1775 404 1571 307636 88 0 0 39841 150400 30231 161988 0 359973 601600
-12 3 1 495408 371556 144621 33674 1154165 1049241 76983 148622 107078 2005 469 1953 472158 100 0 0 76983 230833 33674 222933 0 495408 923332
-12 4 1 879350 659513 156269 38111 1846147 1678315 112564 263805 163319 2250 542 2406 755241 112 0 0 112564 369229 38111 395707 0 879350 1476917
-12 4 2 1271128 953346 167352 42059 2689750 2445227 148780 381338 231450 2500 620 2916 1100352 125 0 0 148780 537950 42059 572007 0 1271128 2151800
-12 5 2 1662905 1247179 177666 46357 3533354 3212140 190573 498871 307989 2750 702 3475 1445463 137 0 0 190573 706670 46357 748307 0 1662905 2826683
-12 5 3 1662905 1247179 177666 46357 3533354 3212140 190573 498871 307989 2750 702 3475 1445463 137 0 0 190573 706670 46357 748307 0 1662905 2826683
-12 6 3 1858794 1394095 183167 48232 3955156 3595596 173870 557638 350423 2875 744 3772 1618018 143 0 0 173870 791031 48232 836457 0 1858794 3164125
+EquipClass EquipColor EquipStar AtkPerC DamagePerC SuperHitRateC SuperHitPerC DamReduceC MaxHPPerC DefPerC LuckyHitRateC PetDamPerC PerLVAtkC MissRateC HitRateC DamBackPerC PerLVMaxHPC DropEquipPerC DropMoneyPerC IgnoreDefRateReduceC DamChanceDefC SuperHitReduceC SkillAtkRateC SpeedPerC AtkSpeedC SkillAtkRateReduceC HitC MissC
+0 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
+0 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
+0 2 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
+0 2 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
+0 2 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
+0 3 0 130300 97725 108714 21161 26869 164699 11434 39090 7833 1250 222 821 74114 62 0 0 11434 36233 21162 58635 0 130300 144935 1300 1300
+0 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
+0 3 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
+0 3 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
+0 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
+0 4 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
+0 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
+0 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
+0 6 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
+1 1 0 1130 847 3500 350 466 424 370 339 0 100 1 10 190 5 0 0 370 93 350 508 0 1130 373 150 150
+1 2 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
+1 5 2 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
+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
+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 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 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 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 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 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 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
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 2c4b26f..ae78a06 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -56,6 +56,7 @@
SkillXPAddByFB 31090|31060|31250 0 0 0 0
SPSkillType {"1":[50005,50105,50405,1005,50205,55005,55105,55405,2005,55205],"2":[50035,50135,50435,1035,50235,55035,55135,55435,2035,55235],"3":[50065,50165,50465,1065,50265,55065,55165,55465,2065,55265],"4":[50305,50505,55305,55505],"5":[50335,50535,55335,55535],"6":[50365,50565,55365,55565],"7":[50605,50705,55605,55705],"8":[50635,50735,55635,55735],"9":[50665,50765,55665,55765],"10":[50805,51005,51105,55805,56005,56105],"11":[50835,51035,51135,55835,56035,56135],"12":[50865,51065,51165,55865,56065,56165]} 6000 0 0 0
PassSkillEquipLimit {"0":{"level":70},"1":{"level":70},"2":{"OpenSkillSlots":2},"3":{"OpenSkillSlots":3},"4":{"OpenSkillSlots":4},"5":{"OpenSkillSlots":5}} 6 3 2_20005|3_20006|4_20007|5_20008
+TalentResetBook 948 380
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
@@ -164,7 +165,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:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15: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,8,11,20,19,23] int(((MinAtk+MaxAtk)*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)) 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+IceAtkPer*5.0+IceDefPer*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+MaxHPPer/10000.0+PerLVAtk/100.0+Hit/10000.0+Miss/10000.0) 0 0
HorseUpItem 181 20 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)}
@@ -239,7 +240,7 @@
SealDemonFirstPos [20,16]
UnblockTreasure 101|102|103 {301:'UnblockTreasure301',302:'UnblockTreasure302',303:'UnblockTreasure303',304:'UnblockTreasure304',305:'UnblockTreasure305',306:'UnblockTreasure306',307:'UnblockTreasure307',308:'UnblockTreasure308'}
MWSignDayAttr {"7":100} 304
-DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,0]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,1]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"4":{"exp":"360*reExp","gold":500000,"item":[2381,3]},"5":{"exp":"360*reExp","gold":500000,"item":[2381,4]},"6":{"exp":"720*reExp","gold":1000000,"item":[2382,8]}}
+DiceReward {"0":{"exp":"180*reExp","gold":0,"item":[2211,0]},"1":{"exp":"360*reExp","gold":0,"item":[2211,1]},"2":{"exp":"360*reExp","gold":100000,"item":[2211,2]},"3":{"exp":"360*reExp","gold":100000,"item":[2211,3]},"4":{"exp":"360*reExp","gold":500000,"item":[2381,4]},"5":{"exp":"360*reExp","gold":500000,"item":[2381,7]},"6":{"exp":"720*reExp","gold":1000000,"item":[2382,12]}}
DiceFreeNum 5
DiceRandomList {0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}
TJG int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times 300 72000 {1:[50900, 50902],2:[55900,55902]} 48215|48235|48245|48260|48275|48320|48290
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index c3df4c3..48dda06 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -40,7 +40,7 @@
87 0 30101 0 0
88 105 0 0 0
89 110 0 0 0
-90 170 0 0 0
+90 175 0 0 0
91 180 0 0 0
92 205 0 0 0
93 240 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index cf878f7..ade9ea5 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -2,10 +2,10 @@
1 60 0 {"1":[[922,1],[4151,2],[911,1],[2,1]],"2":[[922,1],[4151,2],[911,1],[2,1]],"3":[[922,1],[4151,2],[911,1],[2,1]]} 2 [[4151,10]]
2 80 0 {"1":[[3511,1],[1500,1],[2,1],[2107,1]],"2":[[3511,1],[1500,1],[2,1],[2107,1]],"3":[[3511,1],[1500,1],[2,1],[2107,1]]} 2 [[181,10]]
3 100 0 {"1":[[4151,5],[1502,1],[4001,1],[2107,1]],"2":[[4151,5],[1502,1],[4001,1],[2107,1]],"3":[[4151,5],[1502,1],[4001,1],[2107,1]]} 2 [[194,1]]
-4 120 0 {"1":[[105,2],[102,5],[141,15],[911,1]],"2":[[105,2],[102,5],[141,15],[911,1]],"3":[[105,2],[102,5],[141,15],[911,1]]} 2 [[1001,1]]
-5 150 0 {"1":[[1501,1],[142,20],[151,1],[30,100]],"2":[[1501,1],[142,20],[151,1],[30,100]],"3":[[1501,1],[142,20],[151,1],[30,100]]} 3 [[5,1]]
-6 180 0 {"1":[[3801,1],[181,5],[4151,5],[911,1]],"2":[[3801,1],[181,5],[4151,5],[911,1]],"3":[[3801,1],[181,5],[4151,5],[911,1]]} 3 [[199,1]]
-7 200 0 {"1":[[2241,1],[3503,1],[912,1],[181,10]],"2":[[2241,1],[3503,1],[912,1],[181,10]],"3":[[2241,1],[3503,1],[912,1],[181,10]]} 4 [[1002,1]]
-8 220 0 {"1":[[193,1],[3504,1],[923,1],[3,1]],"2":[[193,1],[3504,1],[923,1],[3,1]],"3":[[193,1],[3504,1],[923,1],[3,1]]} 4 [[144,80]]
+4 120 0 {"1":[[105,2],[102,5],[141,50],[911,1]],"2":[[105,2],[102,5],[141,50],[911,1]],"3":[[105,2],[102,5],[141,50],[911,1]]} 2 [[1001,1]]
+5 150 0 {"1":[[1501,1],[142,50],[151,1],[30,100]],"2":[[1501,1],[142,50],[151,1],[30,100]],"3":[[1501,1],[142,50],[151,1],[30,100]]} 3 [[5,1]]
+6 180 0 {"1":[[2241,1],[181,5],[4151,5],[911,1]],"2":[[2241,1],[181,5],[4151,5],[911,1]],"3":[[2241,1],[181,5],[4151,5],[911,1]]} 3 [[199,1]]
+7 200 0 {"1":[[3801,1],[3503,1],[912,1],[181,10]],"2":[[3801,1],[3503,1],[912,1],[181,10]],"3":[[3801,1],[3503,1],[912,1],[181,10]]} 4 [[1002,1]]
+8 220 0 {"1":[[193,1],[3504,1],[923,1],[3,1]],"2":[[193,1],[3504,1],[923,1],[3,1]],"3":[[193,1],[3504,1],[923,1],[3,1]]} 4 [[144,100]]
9 250 0 {"1":[[195,1],[5303,50],[3514,1],[4,1]],"2":[[195,1],[5303,50],[3514,1],[4,1]],"3":[[195,1],[5303,50],[3514,1],[4,1]]} 5 [[4606,1]]
10 300 0 {"1":[[196,1],[3515,1],[143,30],[5,1]],"2":[[196,1],[3515,1],[143,30],[5,1]],"3":[[196,1],[3515,1],[143,30],[5,1]]} 5 [[3802,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f2ee799..2b50bd6 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -5,12 +5,12 @@
5 1 0 2213 1 1 [] 0 7 0|1|2|3|4|5|6|7|8|9|10 0 10|15|20|25|30|35|40|50|60|70|80 1 15 0 0
6 1 0 3504 1 1 [] 0 7 2 0 2 1 135 0 0
7 1 0 3514 1 1 [] 0 7 2 0 2 1 135 0 0
-8 1 0 2204 1 1 [] 0 7 3 155 6 1 100 0 0
+8 1 0 2204 1 1 [] 0 7 3 155 6 1 60 0 0
9 1 0 2203 1 1 [] 0 7 4|6|8 180 2|3|4 1 60 0 0
10 1 0 4187 1 1 [] 0 7 9 0 1 1 1000 0 0
11 1 0 4188 1 1 [] 0 7 9 0 1 1 1000 0 0
12 1 0 2325 1 1 [] 0 7 0 110 1 2 0 0 0
-13 1 0 4741 1 1 [] 0 7 0 125 1 1 30 0 0
+13 1 0 4741 1 1 [] 0 7 1 125 1 1 30 0 0
51 2 0 3796 1 0 [] 0 0 0 0 0 1 280 0 0
52 2 0 3797 1 0 [] 0 0 0 0 0 1 280 0 0
53 2 0 4101 1 0 [] 0 0 0 0 0 1 380 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
new file mode 100644
index 0000000..8f5e0bb
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagTalentSkill.txt
@@ -0,0 +1,61 @@
+skillId type series
+51200 1 1
+51250 1 1
+51300 1 1
+51350 1 1
+51400 1 1
+51450 1 1
+51500 1 1
+51550 1 1
+51600 1 2
+51650 1 2
+51700 1 2
+51750 1 2
+51800 1 2
+51850 1 2
+51900 1 2
+51950 1 2
+52000 1 2
+52050 1 2
+52100 1 3
+52150 1 3
+52200 1 3
+52250 1 3
+52300 1 3
+52350 1 3
+52400 1 3
+52450 1 3
+52500 1 3
+52550 2 1
+52600 2 1
+52650 2 1
+52700 2 1
+52750 2 1
+52800 2 1
+52850 2 1
+52900 2 1
+52950 2 2
+53000 2 2
+53050 2 2
+53100 2 2
+53150 2 2
+53200 2 2
+53250 2 2
+53300 2 2
+53350 2 2
+53400 2 2
+53450 2 3
+53500 2 3
+53550 2 3
+53600 2 3
+53650 2 3
+53700 2 3
+53750 2 3
+53800 2 3
+53850 2 3
+53900 2 3
+53950 2 3
+54000 2 3
+54050 2 3
+54100 2 3
+54150 2 3
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index f65c484..9d30ff8 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -34,10 +34,10 @@
2 8 441075 0 142 7 8000
2 9 535590 0 142 12 8000
2 10 630110 0 142 17 8000
-2 11 724625 0 142 54 8000
-2 12 819140 0 142 62 8000
-2 13 913655 0 142 71 8000
-2 14 1008175 0 142 82 8000
+2 11 724625 0 142 31 8000
+2 12 819140 0 142 44 8000
+2 13 913655 0 142 60 8000
+2 14 1008175 0 142 75 8000
2 15 1323230 0 142 93 8000
2 16 1638280 0 142 105 8000
2 17 1953335 0 142 118 8000
@@ -59,13 +59,13 @@
3 8 475200 0 143 6 8000
3 9 577025 0 143 10 8000
3 10 678855 0 143 14 8000
-3 11 780685 0 143 42 8000
-3 12 882510 0 143 49 8000
-3 13 984340 0 143 56 8000
-3 14 1086170 0 143 64 8000
-3 15 1425595 0 143 72 8000
-3 16 1765025 0 143 82 8000
-3 17 2104450 0 143 92 8000
+3 11 780685 0 143 19 8000
+3 12 882510 0 143 25 8000
+3 13 984340 0 143 36 8000
+3 14 1086170 0 143 45 8000
+3 15 1425595 0 143 58 8000
+3 16 1765025 0 143 71 8000
+3 17 2104450 0 143 87 8000
3 18 2443880 0 143 104 8000
3 19 2783305 0 143 116 8000
3 20 3631875 0 143 130 8000
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index d1e9791..79504a2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -302,7 +302,7 @@
50106311 16 0 海牛侍卫 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1
50106312 16 0 雷震子 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1
50106313 16 0 极炎剑客 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1
-50106314 16 0 双头火狼 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1
+50106314 16 0 阴雷之狼 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 3 3 0 0 0 0 0 0 105 0 1
50106315 16 0 雷蛟 441 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1 1 0 300 2 8 0 0 0 0 0 0 0 0 0 20 2 48189 0 0 0 0 0 0 0 105 0 1
50105001 16 0 傲世神驹 1 0 1 2 26 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1200 100 0 300 0 2 0 0 0 0 0 0 0 0 0 10 2 203 0 0 0 0 0 0 0 105 1 2
50105002 3 0 枪元素 1 0 1 1 1 0 0 0 0 0 0 0 0 1 0 0 0 0 3000 1 1 0 100 0 10 50932 0 0 0 0 0 0 0 0 10 2 5 0 0 0 0 0 0 0 101 0 1
--
Gitblit v1.8.0