From 82dbbaaa538b23d4192871f622f54a10c601e49d Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 08 十二月 2018 17:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagWishingWell.txt | 108 +++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/PySysDB/tagGodWeapon.txt | 436 +++++++++++++++++++++---------------------
db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt | 18
6 files changed, 287 insertions(+), 277 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index 7e8d89f..2bda7fb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.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 46155d4..651c98f 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 2519c63..5b1ac21 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -100,7 +100,7 @@
GodWeapon2 104|105|106 0 0 0 0
GodWeapon3 107|108|109 0 0 0 0
GodWeapon4 110|111|112 int(35469+maxHP*proDefPer/10000.0) 0 0 0
-GodWeaponActive 1 {"2":[[1,120]], "4":[[2,120]]} {"2":250, "4":320} 0 0
+GodWeaponActive 1 {"2":[[1,100]], "4":[[2,150]]} {"2":250, "4":320} 0 0
GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
GodMagicExp {"1":[1,10],"2":[1,10],"4":[1,10]}
MagicExterior {"1":0,"2":0,"3":0,"4":0} 0 500
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
index 3e207b7..d1fed3a 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
@@ -28,7 +28,7 @@
1 27 47 6|7 7622|254 0
1 28 48 6|7 7869|262 0
1 29 49 6|7 8120|270 0
-1 30 50 6|7 8375|279 48040 GetMagicSkill5
+1 30 50 6|7 8375|279 0
1 31 51 6|7 8635|287 0
1 32 52 6|7 8900|296 0
1 33 53 6|7 9171|305 0
@@ -48,7 +48,7 @@
1 47 73 6|7 13618|453 0
1 48 75 6|7 13992|466 0
1 49 77 6|7 14376|479 0
-1 50 79 6|7 14769|492 0
+1 50 79 6|7 14769|492 48040 GetMagicSkill5
1 51 81 6|7 15170|505 0
1 52 82 6|7 15579|519 0
1 53 83 6|7 15998|533 0
@@ -148,7 +148,7 @@
1 147 1254 6|7 77252|2575 0
1 148 1277 6|7 78259|2608 0
1 149 1300 6|7 79276|2642 0
-1 150 1323 6|7 80303|2676 0
+1 150 1323 6|7 80303|2676 48045 GetMagicSkill6
1 151 1333 6|7 81354|2711 0
1 152 1343 6|7 82406|2746 0
1 153 1353 6|7 83459|2781 0
@@ -198,7 +198,7 @@
1 197 1793 6|7 130237|4341 0
1 198 1803 6|7 131311|4377 0
1 199 1813 6|7 132386|4412 0
-1 200 1823 6|7 133461|4448 48045 GetMagicSkill6
+1 200 1823 6|7 133461|4448 0
1 201 1833 6|7 134536|4484 0
1 202 1843 6|7 135612|4520 0
1 203 1853 6|7 136688|4556 0
@@ -298,7 +298,7 @@
1 297 2793 6|7 240008|8000 0
1 298 2803 6|7 241130|8037 0
1 299 2813 6|7 242253|8075 0
-1 300 2823 6|7 243376|8112 0
+1 300 2823 6|7 243376|8112 48050 GetMagicSkill7
1 301 2833 6|7 244546|8151 0
1 302 2843 6|7 245761|8192 0
1 303 2853 6|7 247021|8234 0
@@ -323,7 +323,7 @@
1 322 3043 6|7 277065|9235 0
1 323 3053 6|7 278820|9294 0
1 324 3063 6|7 280576|9352 0
-1 325 3073 6|7 282332|9411 48050 GetMagicSkill7
+1 325 3073 6|7 282332|9411 0
1 326 3083 6|7 284088|9469 0
1 327 3093 6|7 285845|9528 0
1 328 3103 6|7 287603|9586 0
@@ -399,206 +399,206 @@
1 398 3803 6|7 411816|13727 0
1 399 3813 6|7 413608|13786 0
1 400 3823 6|7 415400|13846 0
-1 401 3833 6|7 417192|13906
-1 402 3843 6|7 418985|13966
-1 403 3853 6|7 420779|14025
-1 404 3863 6|7 422573|14085
-1 405 3873 6|7 424367|14145
-1 406 3883 6|7 426162|14205
-1 407 3893 6|7 427957|14265
-1 408 3903 6|7 429753|14325
-1 409 3913 6|7 431550|14385
-1 410 3923 6|7 433346|14444
-1 411 3933 6|7 435144|14504
-1 412 3943 6|7 436941|14564
-1 413 3953 6|7 438740|14624
-1 414 3963 6|7 440538|14684
-1 415 3973 6|7 442338|14744
-1 416 3983 6|7 444137|14804
-1 417 3993 6|7 445937|14864
-1 418 4003 6|7 447738|14924
-1 419 4013 6|7 449539|14984
-1 420 4023 6|7 451341|15044
-1 421 4033 6|7 453143|15104
-1 422 4043 6|7 454945|15164
-1 423 4053 6|7 456748|15224
-1 424 4063 6|7 458552|15285
-1 425 4073 6|7 460356|15345
-1 426 4083 6|7 462160|15405
-1 427 4093 6|7 463965|15465
-1 428 4103 6|7 465771|15525
-1 429 4113 6|7 467577|15585
-1 430 4123 6|7 469383|15646
-1 431 4133 6|7 471190|15706
-1 432 4143 6|7 472997|15766
-1 433 4153 6|7 474805|15826
-1 434 4163 6|7 476614|15887
-1 435 4173 6|7 478422|15947
-1 436 4183 6|7 480232|16007
-1 437 4193 6|7 482041|16068
-1 438 4203 6|7 483852|16128
-1 439 4213 6|7 485662|16188
-1 440 4223 6|7 487474|16249
-1 441 4233 6|7 489285|16309
-1 442 4243 6|7 491097|16369
-1 443 4253 6|7 492910|16430
-1 444 4263 6|7 494723|16490
-1 445 4273 6|7 496537|16551
-1 446 4283 6|7 498351|16611
-1 447 4293 6|7 500166|16672
-1 448 4303 6|7 501981|16732
-1 449 4313 6|7 503796|16793
-1 450 4323 6|7 505612|16853
-1 451 4333 6|7 507429|16914
-1 452 4343 6|7 509246|16974
-1 453 4353 6|7 511063|17035
-1 454 4363 6|7 512881|17096
-1 455 4373 6|7 514699|17156
-1 456 4383 6|7 516518|17217
-1 457 4393 6|7 518338|17277
-1 458 4403 6|7 520157|17338
-1 459 4413 6|7 521978|17399
-1 460 4423 6|7 523798|17459
-1 461 4433 6|7 525620|17520
-1 462 4443 6|7 527442|17581
-1 463 4453 6|7 529264|17642
-1 464 4463 6|7 531087|17702
-1 465 4473 6|7 532910|17763
-1 466 4483 6|7 534733|17824
-1 467 4493 6|7 536558|17885
-1 468 4503 6|7 538382|17946
-1 469 4513 6|7 540207|18006
-1 470 4523 6|7 542033|18067
-1 471 4533 6|7 543859|18128
-1 472 4543 6|7 545686|18189
-1 473 4553 6|7 547513|18250
-1 474 4563 6|7 549340|18311
-1 475 4573 6|7 551168|18372
-1 476 4583 6|7 552997|18433
-1 477 4593 6|7 554826|18494
-1 478 4603 6|7 556655|18555
-1 479 4613 6|7 558485|18616
-1 480 4623 6|7 560315|18677
-1 481 4633 6|7 562146|18738
-1 482 4643 6|7 563978|18799
-1 483 4653 6|7 565809|18860
-1 484 4663 6|7 567642|18921
-1 485 4673 6|7 569475|18982
-1 486 4683 6|7 571308|19043
-1 487 4693 6|7 573142|19104
-1 488 4703 6|7 574976|19165
-1 489 4713 6|7 576811|19227
-1 490 4723 6|7 578646|19288
-1 491 4733 6|7 580481|19349
-1 492 4743 6|7 582318|19410
-1 493 4753 6|7 584154|19471
-1 494 4763 6|7 585991|19533
-1 495 4773 6|7 587829|19594
-1 496 4783 6|7 589667|19655
-1 497 4793 6|7 591506|19716
-1 498 4803 6|7 593345|19778
-1 499 4813 6|7 595184|19839
-1 500 4823 6|7 597024|19900
-1 501 4833 6|7 598865|19962
-1 502 4843 6|7 600706|20023
-1 503 4853 6|7 602547|20084
-1 504 4863 6|7 604389|20146
-1 505 4873 6|7 606231|20207
-1 506 4883 6|7 608074|20269
-1 507 4893 6|7 609918|20330
-1 508 4903 6|7 611762|20392
-1 509 4913 6|7 613606|20453
-1 510 4923 6|7 615451|20515
-1 511 4933 6|7 617296|20576
-1 512 4943 6|7 619142|20638
-1 513 4953 6|7 620988|20699
-1 514 4963 6|7 622835|20761
-1 515 4973 6|7 624682|20822
-1 516 4983 6|7 626530|20884
-1 517 4993 6|7 628378|20945
-1 518 5003 6|7 630226|21007
-1 519 5013 6|7 632075|21069
-1 520 5023 6|7 633925|21130
-1 521 5033 6|7 635775|21192
-1 522 5043 6|7 637626|21254
-1 523 5053 6|7 639477|21315
-1 524 5063 6|7 641328|21377
-1 525 5073 6|7 643180|21439
-1 526 5083 6|7 645033|21501
-1 527 5093 6|7 646886|21562
-1 528 5103 6|7 648739|21624
-1 529 5113 6|7 650593|21686
-1 530 5123 6|7 652447|21748
-1 531 5133 6|7 654302|21810
-1 532 5143 6|7 656158|21871
-1 533 5153 6|7 658014|21933
-1 534 5163 6|7 659870|21995
-1 535 5173 6|7 661727|22057
-1 536 5183 6|7 663584|22119
-1 537 5193 6|7 665442|22181
-1 538 5203 6|7 667300|22243
-1 539 5213 6|7 669159|22305
-1 540 5223 6|7 671028|22367
-1 541 5233 6|7 672907|22430
-1 542 5243 6|7 674796|22493
-1 543 5253 6|7 676695|22556
-1 544 5263 6|7 678603|22620
-1 545 5273 6|7 680522|22684
-1 546 5283 6|7 682451|22748
-1 547 5293 6|7 684391|22813
-1 548 5303 6|7 686341|22878
-1 549 5313 6|7 688301|22943
-1 550 5323 6|7 690272|23009
-1 551 5333 6|7 692254|23075
-1 552 5343 6|7 694247|23141
-1 553 5353 6|7 696250|23208
-1 554 5363 6|7 698265|23275
-1 555 5373 6|7 700290|23343
-1 556 5383 6|7 702327|23410
-1 557 5393 6|7 704375|23479
-1 558 5403 6|7 706434|23547
-1 559 5413 6|7 708505|23616
-1 560 5423 6|7 710587|23686
-1 561 5433 6|7 712681|23756
-1 562 5443 6|7 714786|23826
-1 563 5453 6|7 716904|23896
-1 564 5463 6|7 719033|23967
-1 565 5473 6|7 721174|24039
-1 566 5483 6|7 723328|24110
-1 567 5493 6|7 725493|24183
-1 568 5503 6|7 727671|24255
-1 569 5513 6|7 729862|24328
-1 570 5523 6|7 732064|24402
-1 571 5533 6|7 734280|24476
-1 572 5543 6|7 736508|24550
-1 573 5553 6|7 738749|24624
-1 574 5563 6|7 741002|24700
-1 575 5573 6|7 743269|24775
-1 576 5583 6|7 745549|24851
-1 577 5593 6|7 747842|24928
-1 578 5603 6|7 750148|25004
-1 579 5613 6|7 752467|25082
-1 580 5623 6|7 754800|25160
-1 581 5633 6|7 757147|25238
-1 582 5643 6|7 759507|25316
-1 583 5653 6|7 761881|25396
-1 584 5679 6|7 764269|25475
-1 585 5713 6|7 766671|25555
-1 586 5746 6|7 769086|25636
-1 587 5780 6|7 771516|25717
-1 588 5814 6|7 773961|25798
-1 589 5848 6|7 776419|25880
-1 590 5883 6|7 778892|25963
-1 591 5917 6|7 781380|26046
-1 592 5952 6|7 783882|26129
-1 593 5987 6|7 786399|26213
-1 594 6023 6|7 788931|26297
-1 595 6058 6|7 791478|26382
-1 596 6094 6|7 794040|26468
-1 597 6130 6|7 796618|26553
-1 598 6167 6|7 799210|26640
-1 599 6203 6|7 801818|26727
-1 600 0 6|7 804441|26814
+1 401 3833 6|7 417192|13906 0
+1 402 3843 6|7 418985|13966 0
+1 403 3853 6|7 420779|14025 0
+1 404 3863 6|7 422573|14085 0
+1 405 3873 6|7 424367|14145 0
+1 406 3883 6|7 426162|14205 0
+1 407 3893 6|7 427957|14265 0
+1 408 3903 6|7 429753|14325 0
+1 409 3913 6|7 431550|14385 0
+1 410 3923 6|7 433346|14444 0
+1 411 3933 6|7 435144|14504 0
+1 412 3943 6|7 436941|14564 0
+1 413 3953 6|7 438740|14624 0
+1 414 3963 6|7 440538|14684 0
+1 415 3973 6|7 442338|14744 0
+1 416 3983 6|7 444137|14804 0
+1 417 3993 6|7 445937|14864 0
+1 418 4003 6|7 447738|14924 0
+1 419 4013 6|7 449539|14984 0
+1 420 4023 6|7 451341|15044 0
+1 421 4033 6|7 453143|15104 0
+1 422 4043 6|7 454945|15164 0
+1 423 4053 6|7 456748|15224 0
+1 424 4063 6|7 458552|15285 0
+1 425 4073 6|7 460356|15345 0
+1 426 4083 6|7 462160|15405 0
+1 427 4093 6|7 463965|15465 0
+1 428 4103 6|7 465771|15525 0
+1 429 4113 6|7 467577|15585 0
+1 430 4123 6|7 469383|15646 0
+1 431 4133 6|7 471190|15706 0
+1 432 4143 6|7 472997|15766 0
+1 433 4153 6|7 474805|15826 0
+1 434 4163 6|7 476614|15887 0
+1 435 4173 6|7 478422|15947 0
+1 436 4183 6|7 480232|16007 0
+1 437 4193 6|7 482041|16068 0
+1 438 4203 6|7 483852|16128 0
+1 439 4213 6|7 485662|16188 0
+1 440 4223 6|7 487474|16249 0
+1 441 4233 6|7 489285|16309 0
+1 442 4243 6|7 491097|16369 0
+1 443 4253 6|7 492910|16430 0
+1 444 4263 6|7 494723|16490 0
+1 445 4273 6|7 496537|16551 0
+1 446 4283 6|7 498351|16611 0
+1 447 4293 6|7 500166|16672 0
+1 448 4303 6|7 501981|16732 0
+1 449 4313 6|7 503796|16793 0
+1 450 4323 6|7 505612|16853 0
+1 451 4333 6|7 507429|16914 0
+1 452 4343 6|7 509246|16974 0
+1 453 4353 6|7 511063|17035 0
+1 454 4363 6|7 512881|17096 0
+1 455 4373 6|7 514699|17156 0
+1 456 4383 6|7 516518|17217 0
+1 457 4393 6|7 518338|17277 0
+1 458 4403 6|7 520157|17338 0
+1 459 4413 6|7 521978|17399 0
+1 460 4423 6|7 523798|17459 0
+1 461 4433 6|7 525620|17520 0
+1 462 4443 6|7 527442|17581 0
+1 463 4453 6|7 529264|17642 0
+1 464 4463 6|7 531087|17702 0
+1 465 4473 6|7 532910|17763 0
+1 466 4483 6|7 534733|17824 0
+1 467 4493 6|7 536558|17885 0
+1 468 4503 6|7 538382|17946 0
+1 469 4513 6|7 540207|18006 0
+1 470 4523 6|7 542033|18067 0
+1 471 4533 6|7 543859|18128 0
+1 472 4543 6|7 545686|18189 0
+1 473 4553 6|7 547513|18250 0
+1 474 4563 6|7 549340|18311 0
+1 475 4573 6|7 551168|18372 0
+1 476 4583 6|7 552997|18433 0
+1 477 4593 6|7 554826|18494 0
+1 478 4603 6|7 556655|18555 0
+1 479 4613 6|7 558485|18616 0
+1 480 4623 6|7 560315|18677 0
+1 481 4633 6|7 562146|18738 0
+1 482 4643 6|7 563978|18799 0
+1 483 4653 6|7 565809|18860 0
+1 484 4663 6|7 567642|18921 0
+1 485 4673 6|7 569475|18982 0
+1 486 4683 6|7 571308|19043 0
+1 487 4693 6|7 573142|19104 0
+1 488 4703 6|7 574976|19165 0
+1 489 4713 6|7 576811|19227 0
+1 490 4723 6|7 578646|19288 0
+1 491 4733 6|7 580481|19349 0
+1 492 4743 6|7 582318|19410 0
+1 493 4753 6|7 584154|19471 0
+1 494 4763 6|7 585991|19533 0
+1 495 4773 6|7 587829|19594 0
+1 496 4783 6|7 589667|19655 0
+1 497 4793 6|7 591506|19716 0
+1 498 4803 6|7 593345|19778 0
+1 499 4813 6|7 595184|19839 0
+1 500 4823 6|7 597024|19900 0
+1 501 4833 6|7 598865|19962 0
+1 502 4843 6|7 600706|20023 0
+1 503 4853 6|7 602547|20084 0
+1 504 4863 6|7 604389|20146 0
+1 505 4873 6|7 606231|20207 0
+1 506 4883 6|7 608074|20269 0
+1 507 4893 6|7 609918|20330 0
+1 508 4903 6|7 611762|20392 0
+1 509 4913 6|7 613606|20453 0
+1 510 4923 6|7 615451|20515 0
+1 511 4933 6|7 617296|20576 0
+1 512 4943 6|7 619142|20638 0
+1 513 4953 6|7 620988|20699 0
+1 514 4963 6|7 622835|20761 0
+1 515 4973 6|7 624682|20822 0
+1 516 4983 6|7 626530|20884 0
+1 517 4993 6|7 628378|20945 0
+1 518 5003 6|7 630226|21007 0
+1 519 5013 6|7 632075|21069 0
+1 520 5023 6|7 633925|21130 0
+1 521 5033 6|7 635775|21192 0
+1 522 5043 6|7 637626|21254 0
+1 523 5053 6|7 639477|21315 0
+1 524 5063 6|7 641328|21377 0
+1 525 5073 6|7 643180|21439 0
+1 526 5083 6|7 645033|21501 0
+1 527 5093 6|7 646886|21562 0
+1 528 5103 6|7 648739|21624 0
+1 529 5113 6|7 650593|21686 0
+1 530 5123 6|7 652447|21748 0
+1 531 5133 6|7 654302|21810 0
+1 532 5143 6|7 656158|21871 0
+1 533 5153 6|7 658014|21933 0
+1 534 5163 6|7 659870|21995 0
+1 535 5173 6|7 661727|22057 0
+1 536 5183 6|7 663584|22119 0
+1 537 5193 6|7 665442|22181 0
+1 538 5203 6|7 667300|22243 0
+1 539 5213 6|7 669159|22305 0
+1 540 5223 6|7 671028|22367 0
+1 541 5233 6|7 672907|22430 0
+1 542 5243 6|7 674796|22493 0
+1 543 5253 6|7 676695|22556 0
+1 544 5263 6|7 678603|22620 0
+1 545 5273 6|7 680522|22684 0
+1 546 5283 6|7 682451|22748 0
+1 547 5293 6|7 684391|22813 0
+1 548 5303 6|7 686341|22878 0
+1 549 5313 6|7 688301|22943 0
+1 550 5323 6|7 690272|23009 0
+1 551 5333 6|7 692254|23075 0
+1 552 5343 6|7 694247|23141 0
+1 553 5353 6|7 696250|23208 0
+1 554 5363 6|7 698265|23275 0
+1 555 5373 6|7 700290|23343 0
+1 556 5383 6|7 702327|23410 0
+1 557 5393 6|7 704375|23479 0
+1 558 5403 6|7 706434|23547 0
+1 559 5413 6|7 708505|23616 0
+1 560 5423 6|7 710587|23686 0
+1 561 5433 6|7 712681|23756 0
+1 562 5443 6|7 714786|23826 0
+1 563 5453 6|7 716904|23896 0
+1 564 5463 6|7 719033|23967 0
+1 565 5473 6|7 721174|24039 0
+1 566 5483 6|7 723328|24110 0
+1 567 5493 6|7 725493|24183 0
+1 568 5503 6|7 727671|24255 0
+1 569 5513 6|7 729862|24328 0
+1 570 5523 6|7 732064|24402 0
+1 571 5533 6|7 734280|24476 0
+1 572 5543 6|7 736508|24550 0
+1 573 5553 6|7 738749|24624 0
+1 574 5563 6|7 741002|24700 0
+1 575 5573 6|7 743269|24775 0
+1 576 5583 6|7 745549|24851 0
+1 577 5593 6|7 747842|24928 0
+1 578 5603 6|7 750148|25004 0
+1 579 5613 6|7 752467|25082 0
+1 580 5623 6|7 754800|25160 0
+1 581 5633 6|7 757147|25238 0
+1 582 5643 6|7 759507|25316 0
+1 583 5653 6|7 761881|25396 0
+1 584 5679 6|7 764269|25475 0
+1 585 5713 6|7 766671|25555 0
+1 586 5746 6|7 769086|25636 0
+1 587 5780 6|7 771516|25717 0
+1 588 5814 6|7 773961|25798 0
+1 589 5848 6|7 776419|25880 0
+1 590 5883 6|7 778892|25963 0
+1 591 5917 6|7 781380|26046 0
+1 592 5952 6|7 783882|26129 0
+1 593 5987 6|7 786399|26213 0
+1 594 6023 6|7 788931|26297 0
+1 595 6058 6|7 791478|26382 0
+1 596 6094 6|7 794040|26468 0
+1 597 6130 6|7 796618|26553 0
+1 598 6167 6|7 799210|26640 0
+1 599 6203 6|7 801818|26727 0
+1 600 0 6|7 804441|26814 0
2 1 30 7|26 325|216 0
2 2 40 7|26 339|226 0
2 3 50 7|26 353|235 0
@@ -628,7 +628,7 @@
2 27 71 7|26 731|487 0
2 28 73 7|26 749|499 0
2 29 74 7|26 768|512 0
-2 30 75 7|26 787|525 48055 GetMagicSkill8
+2 30 75 7|26 787|525 0
2 31 77 7|26 807|538 0
2 32 78 7|26 827|551 0
2 33 80 7|26 847|564 0
@@ -648,7 +648,7 @@
2 47 110 7|26 1180|787 0
2 48 113 7|26 1209|806 0
2 49 116 7|26 1237|825 0
-2 50 119 7|26 1267|844 0
+2 50 119 7|26 1267|844 48055 GetMagicSkill8
2 51 122 7|26 1297|864 0
2 52 123 7|26 1328|885 0
2 53 124 7|26 1359|906 0
@@ -748,7 +748,7 @@
2 147 1881 7|26 5953|3969 0
2 148 1915 7|26 6029|4019 0
2 149 1950 7|26 6105|4070 0
-2 150 1984 7|26 6182|4121 0
+2 150 1984 7|26 6182|4121 48060 GetMagicSkill9
2 151 1995 7|26 6261|4174 0
2 152 2006 7|26 6340|4226 0
2 153 2017 7|26 6418|4279 0
@@ -798,7 +798,7 @@
2 197 2501 7|26 9927|6618 0
2 198 2512 7|26 10007|6671 0
2 199 2523 7|26 10088|6725 0
-2 200 2534 7|26 10169|6779 48060 GetMagicSkill9
+2 200 2534 7|26 10169|6779 0
2 201 2545 7|26 10249|6833 0
2 202 2556 7|26 10330|6886 0
2 203 2567 7|26 10411|6940 0
@@ -898,7 +898,7 @@
2 297 4013 7|26 18160|12106 0
2 298 4048 7|26 18244|12162 0
2 299 4083 7|26 18328|12219 0
-2 300 4118 7|26 18412|12275 0
+2 300 4118 7|26 18412|12275 48065 GetMagicSkill10
2 301 4129 7|26 18500|12333 0
2 302 4140 7|26 18591|12394 0
2 303 4151 7|26 18686|12457 0
@@ -923,7 +923,7 @@
2 322 4360 7|26 20939|13959 0
2 323 4371 7|26 21071|14047 0
2 324 4382 7|26 21202|14135 0
-2 325 4393 7|26 21334|14222 48065 GetMagicSkill10
+2 325 4393 7|26 21334|14222 0
2 326 4404 7|26 21466|14310 0
2 327 4415 7|26 21597|14398 0
2 328 4426 7|26 21729|14486 0
@@ -1629,7 +1629,7 @@
4 27 237 27|73|74 996|248|8000 0
4 28 242 27|73|74 1007|250|8000 0
4 29 246 27|73|74 1018|252|8000 0
-4 30 251 27|73|74 1029|254|8000 48070 GetMagicSkill11
+4 30 251 27|73|74 1029|254|8000 0
4 31 256 27|73|74 1041|257|8000 0
4 32 261 27|73|74 1052|259|8000 0
4 33 267 27|73|74 1064|261|8000 0
@@ -1649,7 +1649,7 @@
4 47 367 27|73|74 1259|300|8000 0
4 48 376 27|73|74 1275|303|8000 0
4 49 385 27|73|74 1292|307|8000 0
-4 50 395 27|73|74 1309|310|8000 0
+4 50 395 27|73|74 1309|310|8000 48070 GetMagicSkill11
4 51 405 27|73|74 1327|314|8000 0
4 52 409 27|73|74 1345|317|8000 0
4 53 414 27|73|74 1363|321|8000 0
@@ -1749,7 +1749,7 @@
4 147 3135 27|73|74 4908|1025|8000 0
4 148 3192 27|73|74 4971|1037|8000 0
4 149 3250 27|73|74 5034|1050|8000 0
-4 150 3307 27|73|74 5098|1063|8000 0
+4 150 3307 27|73|74 5098|1063|8000 48075 GetMagicSkill12
4 151 3317 27|73|74 5164|1076|8000 0
4 152 3327 27|73|74 5230|1089|8000 0
4 153 3337 27|73|74 5296|1102|8000 0
@@ -1799,7 +1799,7 @@
4 197 3777 27|73|74 8219|1682|8000 0
4 198 3787 27|73|74 8286|1696|8000 0
4 199 3797 27|73|74 8353|1709|8000 0
-4 200 3807 27|73|74 8421|1722|8000 48075 GetMagicSkill12
+4 200 3807 27|73|74 8421|1722|8000 0
4 201 3817 27|73|74 8488|1736|8000 0
4 202 3827 27|73|74 8555|1749|8000 0
4 203 3837 27|73|74 8622|1762|8000 0
@@ -1899,7 +1899,7 @@
4 297 6688 27|73|74 15080|3045|8000 0
4 298 6746 27|73|74 15150|3059|8000 0
4 299 6805 27|73|74 15220|3073|8000 0
-4 300 6863 27|73|74 15290|3086|8000 0
+4 300 6863 27|73|74 15290|3086|8000 48080 GetMagicSkill13
4 301 6873 27|73|74 15364|3101|8000 0
4 302 6883 27|73|74 15439|3116|8000 0
4 303 6893 27|73|74 15518|3132|8000 0
@@ -1924,7 +1924,7 @@
4 322 7083 27|73|74 17396|3505|8000 0
4 323 7093 27|73|74 17506|3526|8000 0
4 324 7103 27|73|74 17615|3548|8000 0
-4 325 7113 27|73|74 17725|3570|8000 48080 GetMagicSkill13
+4 325 7113 27|73|74 17725|3570|8000 0
4 326 7123 27|73|74 17835|3592|8000 0
4 327 7133 27|73|74 17945|3614|8000 0
4 328 7143 27|73|74 18055|3635|8000 0
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
index 881a732..13c83ae 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
@@ -1,10 +1,10 @@
type level notifycode
-1 120 GetMagicEffect4
-1 250 GetMagicEffect5
-1 500 GetMagicEffect6
-2 120 GetMagicEffect7
-2 250 GetMagicEffect8
-2 500 GetMagicEffect9
-4 120 GetMagicEffect10
-4 250 GetMagicEffect11
-4 500 GetMagicEffect12
+1 100 GetMagicEffect4
+1 200 GetMagicEffect5
+1 400 GetMagicEffect6
+2 100 GetMagicEffect7
+2 200 GetMagicEffect8
+2 400 GetMagicEffect9
+4 100 GetMagicEffect10
+4 200 GetMagicEffect11
+4 400 GetMagicEffect12
diff --git a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
index eb9fd00..217c764 100644
--- a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
@@ -130,109 +130,119 @@
1 1 [201,250] 855 1 1 17867 3702 0
1 1 [201,250] 12 1 1 1173 3703 2
1 1 [201,250] 13 1 1 50 3704 1
-1 1 [201,250] 3501 1 1 44668 3901 0
-1 1 [201,250] 3502 1 1 35734 3902 0
-1 1 [201,250] 3503 1 1 28587 3903 2
-1 1 [201,250] 3504 1 1 22334 3904 1
-1 1 [201,250] 3505 1 1 2347 3905 1
+1 1 [201,250] 4304 1 1 44668 3801 0
+1 1 [201,250] 4304 2 1 35734 3802 0
+1 1 [201,250] 4304 4 1 28587 3803 0
+1 1 [201,250] 4304 6 1 22334 3804 0
+1 1 [201,250] 4304 10 1 2347 3805 2
+1 1 [201,250] 3501 1 1 22334 3901 0
+1 1 [201,250] 3502 1 1 8933 3902 0
+1 1 [201,250] 3503 1 1 293 3903 2
+1 1 [201,250] 3504 1 1 5 3904 1
1 1 [201,250] 3511 1 1 22334 4001 0
1 1 [201,250] 3512 1 1 8933 4002 0
1 1 [201,250] 3513 1 1 293 4003 2
1 1 [201,250] 3514 1 1 5 4004 1
-1 1 [201,250] 4151 1 1 22334 4101 0
-1 1 [201,250] 4151 2 1 8933 4102 0
-1 1 [201,250] 4151 3 1 293 4103 0
-1 1 [201,250] 4151 10 1 5 4104 2
+1 1 [201,250] 4151 1 1 44668 4101 0
+1 1 [201,250] 4151 2 1 35734 4102 0
+1 1 [201,250] 4151 3 1 28587 4103 0
+1 1 [201,250] 4151 10 1 2934 4104 2
+1 1 [201,250] 4151 20 1 202 4105 1
1 1 [201,250] 181 1 1 44668 4201 0
1 1 [201,250] 181 2 1 35734 4202 0
1 1 [201,250] 181 3 1 28587 4203 0
1 1 [201,250] 181 10 1 2934 4204 2
1 1 [201,250] 181 20 1 202 4205 1
-1 1 [201,250] 4181 1 1 44668 4301 2
-1 1 [201,250] 197 1 1 35734 4302 2
-1 1 [201,250] 4182 1 1 28587 4303 2
-1 1 [201,250] 198 1 1 2934 4304 1
+1 1 [201,250] 4181 1 1 5868 4301 2
+1 1 [201,250] 197 1 1 4694 4302 2
+1 1 [201,250] 4182 1 1 3755 4303 2
+1 1 [201,250] 198 1 1 253 4304 1
1 1 [201,250] 199 1 1 202 4305 1
-1 1 [201,250] 2211 10 1 5868 4401 0
+1 1 [201,250] 2211 10 1 44668 4401 0
1 1 [201,250] 2319 1 1 4694 4402 2
1 1 [201,250] 2326 1 1 3755 4403 2
-1 1 [201,250] 4608 1 1 253 4404 1
-1 1 [201,250] 4606 1 1 202 4405 1
+1 1 [201,250] 4608 1 1 50 4404 1
+1 1 [201,250] 4606 1 1 25 4405 1
1 1 [201,250] 149 1 1 44668 4501 0
-1 1 [201,250] 151 1 1 4694 4502 0
-1 1 [201,250] 154 1 1 3755 4503 0
-1 1 [201,250] 147 1 1 50 4504 0
-1 1 [201,250] 155 1 1 25 4505 2
+1 1 [201,250] 151 1 1 35734 4502 0
+1 1 [201,250] 154 1 1 28587 4503 0
+1 1 [201,250] 147 1 1 22334 4504 0
+1 1 [201,250] 155 1 1 2347 4505 2
1 1 [201,250] 142 10 1 44668 4601 0
1 1 [201,250] 142 20 1 35734 4602 0
1 1 [201,250] 143 20 1 28587 4603 0
-1 1 [201,250] 143 60 1 22334 4604 2
+1 1 [201,250] 143 60 1 2934 4604 2
1 1 [201,250] 144 60 1 2347 4605 2
1 1 [201,250] 5303 10 1 44668 4701 0
1 1 [201,250] 5303 20 1 35734 4702 0
-1 1 [201,250] 5303 30 1 28587 4703 2
+1 1 [201,250] 5303 30 1 3755 4703 2
1 1 [201,250] 5303 40 1 2934 4704 2
-1 1 [201,250] 5303 100 1 2347 4705 1
+1 1 [201,250] 5303 100 1 202 4705 1
1 1 [201,250] 911 1 1 44668 4801 0
1 1 [201,250] 911 2 1 35734 4802 0
-1 1 [201,250] 911 3 1 3755 4803 0
+1 1 [201,250] 911 3 1 28587 4803 0
1 1 [201,250] 912 1 1 2934 4804 2
-1 1 [201,250] 1002 1 1 202 4805 1
+1 1 [201,250] 1002 1 1 50 4805 1
1 0 [201,250] 11 1 1 36796 4901 0
1 0 [201,250] 855 1 1 29436 4902 0
1 0 [201,250] 12 1 1 8456 4903 2
1 0 [201,250] 13 1 1 988 4904 1
1 0 [201,250] 14 1 1 791 4905 1
+1 0 [201,250] 4304 1 1 36796 5001 0
+1 0 [201,250] 4304 2 1 29436 5002 0
+1 0 [201,250] 4304 4 1 23549 5003 0
+1 0 [201,250] 4304 6 1 18398 5004 0
+1 0 [201,250] 4304 10 1 5285 5005 2
1 0 [201,250] 3501 1 1 36796 5101 0
-1 0 [201,250] 3502 1 1 29436 5102 0
-1 0 [201,250] 3503 1 1 23549 5103 2
-1 0 [201,250] 3504 1 1 18398 5104 1
-1 0 [201,250] 3505 1 1 5285 5105 1
+1 0 [201,250] 3502 1 1 22077 5102 0
+1 0 [201,250] 3503 1 1 3964 5103 2
+1 0 [201,250] 3504 1 1 474 5104 1
+1 0 [201,250] 3505 1 1 237 5105 1
1 0 [201,250] 3511 1 1 36796 5201 0
1 0 [201,250] 3512 1 1 22077 5202 0
1 0 [201,250] 3513 1 1 3964 5203 2
1 0 [201,250] 3514 1 1 474 5204 1
1 0 [201,250] 3515 1 1 237 5205 1
1 0 [201,250] 4151 1 1 36796 5301 0
-1 0 [201,250] 4151 2 1 22077 5302 0
-1 0 [201,250] 4151 3 1 3964 5303 0
-1 0 [201,250] 4151 10 1 474 5304 2
-1 0 [201,250] 4151 20 1 237 5305 1
+1 0 [201,250] 4151 2 1 29436 5302 0
+1 0 [201,250] 4151 3 1 23549 5303 0
+1 0 [201,250] 4151 10 1 6606 5304 2
+1 0 [201,250] 4151 20 1 1582 5305 1
1 0 [201,250] 181 1 1 36796 5401 0
1 0 [201,250] 181 2 1 29436 5402 0
1 0 [201,250] 181 3 1 23549 5403 0
1 0 [201,250] 181 10 1 6606 5404 2
1 0 [201,250] 181 20 1 1582 5405 1
-1 0 [201,250] 4181 1 1 36796 5501 2
-1 0 [201,250] 197 1 1 29436 5502 2
-1 0 [201,250] 4182 1 1 23549 5503 2
-1 0 [201,250] 198 1 1 6606 5504 1
+1 0 [201,250] 4181 1 1 13213 5501 2
+1 0 [201,250] 197 1 1 10570 5502 2
+1 0 [201,250] 4182 1 1 8456 5503 2
+1 0 [201,250] 198 1 1 1977 5504 1
1 0 [201,250] 199 1 1 1582 5505 1
-1 0 [201,250] 2211 10 1 13213 5601 0
+1 0 [201,250] 2211 10 1 36796 5601 0
1 0 [201,250] 2319 1 1 10570 5602 2
1 0 [201,250] 2326 1 1 8456 5603 2
-1 0 [201,250] 4608 1 1 1977 5604 1
-1 0 [201,250] 4606 1 1 1582 5605 1
+1 0 [201,250] 4608 1 1 395 5604 1
+1 0 [201,250] 4606 1 1 197 5605 1
1 0 [201,250] 149 1 1 36796 5701 0
-1 0 [201,250] 151 1 1 10570 5702 0
-1 0 [201,250] 154 1 1 8456 5703 0
-1 0 [201,250] 147 1 1 395 5704 0
-1 0 [201,250] 155 1 1 197 5705 2
+1 0 [201,250] 151 1 1 29436 5702 0
+1 0 [201,250] 154 1 1 23549 5703 0
+1 0 [201,250] 147 1 1 18398 5704 0
+1 0 [201,250] 155 1 1 5285 5705 2
1 0 [201,250] 142 10 1 36796 5801 0
1 0 [201,250] 142 20 1 29436 5802 0
1 0 [201,250] 143 20 1 23549 5803 0
-1 0 [201,250] 143 60 1 18398 5804 2
+1 0 [201,250] 143 60 1 6606 5804 2
1 0 [201,250] 144 60 1 5285 5805 2
1 0 [201,250] 5303 10 1 36796 5901 0
1 0 [201,250] 5303 20 1 29436 5902 0
-1 0 [201,250] 5303 30 1 23549 5903 2
+1 0 [201,250] 5303 30 1 8456 5903 2
1 0 [201,250] 5303 40 1 6606 5904 2
-1 0 [201,250] 5303 100 1 5285 5905 1
+1 0 [201,250] 5303 100 1 1582 5905 1
1 0 [201,250] 911 1 1 36796 6001 0
1 0 [201,250] 911 2 1 29436 6002 0
-1 0 [201,250] 911 3 1 8456 6003 0
+1 0 [201,250] 911 3 1 23549 6003 0
1 0 [201,250] 912 1 1 6606 6004 2
-1 0 [201,250] 1002 1 1 1582 6005 1
+1 0 [201,250] 1002 1 1 395 6005 1
1 1 [251,800] 11 1 1 39236 6101 0
1 1 [251,800] 855 1 1 15694 6102 0
1 1 [251,800] 12 1 1 1121 6103 2
--
Gitblit v1.8.0