From 97b3d36a8d65fb491c4c792629dace9ef8219c04 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 28 十一月 2018 23:44:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagWorldLV.txt | 856 ++++++++++++++++++++++++++++----------------------------
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/SysDB/tagChinMap.txt | 6
5 files changed, 436 insertions(+), 436 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index fe67f9d..ed7e41f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -69,7 +69,7 @@
CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
OperationAction 10 0 0 0 0
-HelpBattleCall 6 3 3 10 10
+HelpBattleCall 6 3 3 60 10
HelpBattlePoint 1400 {"1":[10, 10], "2":[10, 10]} 1|2
HelpBattleCheckIn 48 3 {3:[60010], 20:[60010, 51010], 60:[60010, 51010]}
PlayerViewCache 100 [0,4]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagWorldLV.txt b/CoreServerGroup/GameServer/PySysDB/tagWorldLV.txt
index 8179585..19477f0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagWorldLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagWorldLV.txt
@@ -371,431 +371,431 @@
370 6606830
371 6696606
372 6786519
-373 6877970
-374 6970967
-375 7065523
-376 7161648
-377 7259354
-378 7358651
-379 7459552
-380 7562068
-381 7666142
-382 7771692
-383 7878888
-384 7987743
-385 8098267
-386 8210474
-387 8324375
-388 8439984
-389 8557312
-390 8676372
-391 8797177
-392 8919722
-393 9044037
-394 9169876
-395 9297508
-396 9426947
-397 9558206
-398 9691298
-399 9826238
-400 9963039
-401 10100343
-402 10238152
-403 10376448
-404 10514969
-405 10654007
-406 10793566
-407 10933648
-408 11074259
-409 11215401
-410 11357080
-411 11499298
-412 11642061
-413 11785371
-414 11929232
-415 12073649
-416 12218626
-417 12364136
-418 12509909
-419 12656250
-420 12803165
-421 12950656
-422 13098729
-423 13247730
-424 13397289
-425 13547255
-426 13697689
-427 13848724
-428 14000362
-429 14152608
-430 14305466
-431 14458939
-432 14613031
-433 14767746
-434 14923088
-435 15079060
-436 15235667
-437 15392911
-438 15550798
-439 15709109
-440 15867915
-441 16027371
-442 16187483
-443 16348254
-444 16509687
-445 16671786
-446 16834556
-447 16997999
-448 17162120
-449 17326922
-450 17492409
-451 17658422
-452 17824963
-453 17992034
-454 18159640
-455 18327782
-456 18496464
-457 18665688
-458 18835458
-459 19005775
-460 19176643
-461 19348065
-462 19520042
-463 19692579
-464 19865678
-465 20039341
-466 20213572
-467 20388373
-468 20563746
-469 20739695
-470 20916222
-471 21093330
-472 21271021
-473 21449298
-474 21628165
-475 21807622
-476 21987674
-477 22168323
-478 22349571
-479 22531421
-480 22713876
-481 22896938
-482 23080609
-483 23264893
-484 23449793
-485 23635309
-486 23821446
-487 24008205
-488 24195590
-489 24383602
-490 24572244
-491 24761519
-492 24951430
-493 25141978
-494 25333166
-495 25524997
-496 25717474
-497 25910598
-498 26104372
-499 26298798
-500 26493880
-501 26689187
-502 26884724
-503 27080496
-504 27276509
-505 27472769
-506 27669279
-507 27866047
-508 28063075
-509 28260371
-510 28457938
-511 28655783
-512 28853910
-513 29052324
-514 29251031
-515 29450035
-516 29649342
-517 29848956
-518 30048883
-519 30249127
-520 30449694
-521 30650589
-522 30851816
-523 31053380
-524 31255287
-525 31457541
-526 31660148
-527 31863111
-528 32066436
-529 32270128
-530 32474192
-531 32678632
-532 32883454
-533 33088836
-534 33294826
-535 33501427
-536 33708646
-537 33916489
-538 34124960
-539 34334065
-540 34543811
-541 34754202
-542 34965245
-543 35176944
-544 35389306
-545 35602336
-546 35816040
-547 36030422
-548 36245489
-549 36461247
-550 36677701
-551 36894856
-552 37112718
-553 37331293
-554 37550587
-555 37770604
-556 37991351
-557 38212832
-558 38435055
-559 38658024
-560 38881744
-561 39106222
-562 39331463
-563 39557473
-564 39784257
-565 40011820
-566 40240169
-567 40469310
-568 40699246
-569 40929985
-570 41161531
-571 41393891
-572 41627070
-573 41861073
-574 42095907
-575 42331576
-576 42568086
-577 42805443
-578 43043653
-579 43282721
-580 43522652
-581 43763453
-582 44005128
-583 44247684
-584 44491126
-585 44735460
-586 44980690
-587 45226824
-588 45473866
-589 45721821
-590 45970697
-591 46220497
-592 46471228
-593 46722896
-594 46975505
-595 47229062
-596 47483572
-597 47739041
-598 47995474
-599 48252876
-600 48511255
-601 48770614
-602 49030960
-603 49292298
-604 49554634
-605 49817973
-606 50082321
-607 50347684
-608 50614067
-609 50881476
-610 51149916
-611 51419393
-612 51689913
-613 51961480
-614 52234102
-615 52507782
-616 52782528
-617 53058344
-618 53335236
-619 53613210
-620 53892271
-621 54172425
-622 54453677
-623 54736033
-624 55019499
-625 55304080
-626 55589782
-627 55876610
-628 56164571
-629 56453668
-630 56743909
-631 57035299
-632 57327843
-633 57621547
-634 57916416
-635 58212457
-636 58509674
-637 58808073
-638 59107660
-639 59408441
-640 59710421
-641 60013605
-642 60318000
-643 60623610
-644 60930442
-645 61238501
-646 61547792
-647 61858322
-648 62170095
-649 62483118
-650 62797396
-651 63112236
-652 63427647
-653 63743635
-654 64060208
-655 64377374
-656 64695140
-657 65013513
-658 65332501
-659 65652111
-660 65972352
-661 66293229
-662 66614751
-663 66936926
-664 67259760
-665 67583261
-666 67907436
-667 68232294
-668 68557841
-669 68884085
-670 69211033
-671 69538693
-672 69867072
-673 70196178
-674 70526018
-675 70856600
-676 71187930
-677 71520018
-678 71852869
-679 72186491
-680 72520893
-681 72856081
-682 73192062
-683 73528845
-684 73866436
-685 74204844
-686 74544075
-687 74884137
-688 75225038
-689 75566785
-690 75909385
-691 76252845
-692 76597175
-693 76942380
-694 77288468
-695 77635446
-696 77983323
-697 78332106
-698 78681801
-699 79032417
-700 79383961
-701 79736441
-702 80089863
-703 80444235
-704 80799565
-705 81155861
-706 81513129
-707 81871377
-708 82230613
-709 82590843
-710 82952077
-711 83314320
-712 83677580
-713 84041865
-714 84407183
-715 84773540
-716 85140945
-717 85509404
-718 85878925
-719 86249516
-720 86621183
-721 86993936
-722 87367780
-723 87742723
-724 88118773
-725 88495938
-726 88874224
-727 89253639
-728 89634192
-729 90015888
-730 90398735
-731 90782742
-732 91167915
-733 91554262
-734 91941790
-735 92330507
-736 92720420
-737 93111537
-738 93503866
-739 93897412
-740 94292185
-741 94688191
-742 95085439
-743 95483934
-744 95883686
-745 96284701
-746 96686987
-747 97090551
-748 97495400
-749 97901543
-750 98308986
-751 98717738
-752 99127805
-753 99539195
-754 99951915
-755 100365973
-756 100781376
-757 101198133
-758 101616249
-759 102035733
-760 102456592
-761 102878834
-762 103302466
-763 103727495
-764 104153930
-765 104581776
-766 105011043
-767 105441737
-768 105873865
-769 106307436
-770 106742456
-771 107178934
-772 107616876
-773 108056290
-774 108497184
-775 108939564
-776 109383439
-777 109828816
-778 110275702
-779 110724104
-780 111174031
-781 111625490
-782 112078487
-783 112533032
-784 112989130
-785 113446790
-786 113906018
-787 114366823
-788 114829212
-789 115293192
-790 115758771
-791 116225956
-792 116694754
-793 117165174
-794 117637222
-795 118110906
-796 118586234
-797 119063212
-798 119541849
-799 120022152
-800 120504128
+373 6876717
+374 6967201
+375 7057974
+376 7149040
+377 7240401
+378 7332061
+379 7424021
+380 7516285
+381 7608796
+382 7701473
+383 7794463
+384 7887767
+385 7981388
+386 8075328
+387 8169591
+388 8264180
+389 8359097
+390 8454345
+391 8549928
+392 8645832
+393 8742076
+394 8838463
+395 8935195
+396 9032274
+397 9129703
+398 9227485
+399 9325624
+400 9424121
+401 9522979
+402 9622202
+403 9721775
+404 9821510
+405 9921618
+406 10022100
+407 10122959
+408 10224199
+409 10325821
+410 10427830
+411 10530227
+412 10633016
+413 10736199
+414 10839780
+415 10943760
+416 11048143
+417 11152910
+418 11257866
+419 11363232
+420 11469011
+421 11575205
+422 11681817
+423 11789098
+424 11896780
+425 12004756
+426 12113068
+427 12221813
+428 12330993
+429 12440610
+430 12550668
+431 12661169
+432 12772115
+433 12883510
+434 12995356
+435 13107656
+436 13220412
+437 13333628
+438 13447307
+439 13561291
+440 13675631
+441 13790440
+442 13905720
+443 14021475
+444 14137707
+445 14254418
+446 14371612
+447 14489292
+448 14607459
+449 14726116
+450 14845267
+451 14964796
+452 15084705
+453 15204997
+454 15325673
+455 15446735
+456 15568186
+457 15690028
+458 15812262
+459 15934890
+460 16057915
+461 16181339
+462 16305163
+463 16429389
+464 16554021
+465 16679058
+466 16804504
+467 16930361
+468 17056630
+469 17183313
+470 17310412
+471 17437930
+472 17565867
+473 17694227
+474 17823011
+475 17952220
+476 18081858
+477 18211925
+478 18342423
+479 18473356
+480 18604723
+481 18736527
+482 18868771
+483 19001456
+484 19134583
+485 19268155
+486 19402173
+487 19536640
+488 19671557
+489 19806926
+490 19942748
+491 20079026
+492 20215762
+493 20352956
+494 20490612
+495 20628730
+496 20767313
+497 20906363
+498 21045880
+499 21185867
+500 21326326
+501 21466947
+502 21607733
+503 21748689
+504 21889819
+505 22031126
+506 22172614
+507 22314286
+508 22456147
+509 22598199
+510 22740448
+511 22882896
+512 23025548
+513 23168406
+514 23311475
+515 23454758
+516 23598258
+517 23741981
+518 23885928
+519 24030104
+520 24174512
+521 24319156
+522 24464040
+523 24609166
+524 24754539
+525 24900162
+526 25046039
+527 25192172
+528 25338566
+529 25485225
+530 25632151
+531 25779348
+532 25926819
+533 26074695
+534 26223007
+535 26371760
+536 26520958
+537 26670604
+538 26820703
+539 26971259
+540 27122276
+541 27273758
+542 27425709
+543 27578132
+544 27731033
+545 27884414
+546 28038281
+547 28192636
+548 28347485
+549 28502830
+550 28658677
+551 28815029
+552 28971889
+553 29129263
+554 29287155
+555 29445567
+556 29604505
+557 29763972
+558 29923972
+559 30084509
+560 30245588
+561 30407212
+562 30569386
+563 30732113
+564 30895397
+565 31059243
+566 31223654
+567 31388635
+568 31554189
+569 31720321
+570 31887035
+571 32054334
+572 32222223
+573 32390705
+574 32559785
+575 32729467
+576 32899754
+577 33070651
+578 33242162
+579 33414291
+580 33587042
+581 33760418
+582 33934425
+583 34109065
+584 34284343
+585 34460263
+586 34636829
+587 34814045
+588 34991915
+589 35170444
+590 35349634
+591 35529490
+592 35710017
+593 35891217
+594 36073096
+595 36255657
+596 36438904
+597 36622842
+598 36807473
+599 36992803
+600 37178836
+601 37365574
+602 37553023
+603 37741187
+604 37930069
+605 38119673
+606 38310004
+607 38501065
+608 38692861
+609 38885395
+610 39078672
+611 39272695
+612 39467469
+613 39662998
+614 39859286
+615 40056336
+616 40254152
+617 40452740
+618 40652102
+619 40852243
+620 41053167
+621 41254878
+622 41457380
+623 41660676
+624 41864772
+625 42069670
+626 42275375
+627 42481892
+628 42689223
+629 42897374
+630 43106347
+631 43316147
+632 43526779
+633 43738246
+634 43950552
+635 44163701
+636 44377697
+637 44592545
+638 44808248
+639 45024810
+640 45242235
+641 45460528
+642 45679692
+643 45899732
+644 46120651
+645 46342453
+646 46565143
+647 46788724
+648 47013201
+649 47238577
+650 47464857
+651 47691542
+652 47918638
+653 48146149
+654 48374082
+655 48602441
+656 48831233
+657 49060462
+658 49290133
+659 49520253
+660 49750825
+661 49981857
+662 50213353
+663 50445319
+664 50677759
+665 50910680
+666 51144086
+667 51377984
+668 51612378
+669 51847273
+670 52082676
+671 52318591
+672 52555024
+673 52791980
+674 53029465
+675 53267484
+676 53506042
+677 53745145
+678 53984798
+679 54225006
+680 54465775
+681 54707110
+682 54949017
+683 55191501
+684 55434566
+685 55678220
+686 55922466
+687 56167311
+688 56412760
+689 56658817
+690 56905489
+691 57152781
+692 57400698
+693 57649246
+694 57898429
+695 58148254
+696 58398725
+697 58649849
+698 58901629
+699 59154073
+700 59407184
+701 59660970
+702 59915434
+703 60170582
+704 60426419
+705 60682952
+706 60940185
+707 61198124
+708 61456773
+709 61716140
+710 61976227
+711 62237042
+712 62498590
+713 62760875
+714 63023904
+715 63287681
+716 63552212
+717 63817503
+718 64083558
+719 64350384
+720 64617984
+721 64886366
+722 65155534
+723 65425493
+724 65696249
+725 65967808
+726 66240174
+727 66513353
+728 66787350
+729 67062171
+730 67337822
+731 67614306
+732 67891631
+733 68169801
+734 68448821
+735 68728697
+736 69009435
+737 69291039
+738 69573515
+739 69856869
+740 70141106
+741 70426230
+742 70712248
+743 70999165
+744 71286986
+745 71575717
+746 71865363
+747 72155929
+748 72447420
+749 72739843
+750 73033202
+751 73327504
+752 73622752
+753 73918952
+754 74216111
+755 74514233
+756 74813323
+757 75113388
+758 75414432
+759 75716460
+760 76019479
+761 76323493
+762 76628508
+763 76934529
+764 77241562
+765 77549611
+766 77858683
+767 78168783
+768 78479915
+769 78792086
+770 79105301
+771 79419565
+772 79734883
+773 80051261
+774 80368704
+775 80687218
+776 81006808
+777 81327480
+778 81649237
+779 81972087
+780 82296035
+781 82621085
+782 82947243
+783 83274515
+784 83602906
+785 83932421
+786 84263065
+787 84594845
+788 84927765
+789 85261831
+790 85597047
+791 85933420
+792 86270955
+793 86609658
+794 86949532
+795 87290585
+796 87632821
+797 87976245
+798 88320864
+799 88666682
+800 89013704
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 220cc46..6d614ac 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -16,11 +16,11 @@
8 15 400 1 [(262,1,1),(181,100,1)] 262 LimitGift3
4 16 60 1 [(4215,1,1),(4151,30,1)] 4215 LimitGift3
5 17 180 1 [(7002,1,1),(195,1,1)] 7002 LimitGift3
-5 18 140 1 [(263,1,1),(181,50,1)] 263 LimitGift3
-5 19 130 1 [(4220,1,1),(4151,50,1)] 4220 LimitGift3
+5 18 150 1 [(263,1,1),(181,60,1)] 263 LimitGift3
+5 19 150 1 [(4220,1,1),(4151,60,1)] 4220 LimitGift3
4 20 80 1 [(913,1,1),(181,30,1)] 913 LimitGift3
7 21 260 1 [(4214,1,1),(4151,100,1)] 4214 LimitGift3
-4 22 60 1 [(265,1,1),(181,30,1)] 265 LimitGift3
+3 22 60 1 [(265,1,1),(181,30,1)] 265 LimitGift3
2 23 25 1 [(2213,20,1)] 2213 LimitGift3
2 24 27 1 [(3514,1,1)] 3514 LimitGift3
2 25 27 1 [(4694,9,1)] 4694 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 86575aa..9d672ab 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -314,7 +314,7 @@
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
WishingWellCfg 14400 10 8 5
-HelpBattleCall 6 3 3 10 10
+HelpBattleCall 6 3 3 60 10
HelpBattleRefresh 5 5 2 5
HelpBattlePoint 1400 {"1":[10, 10], "2":[10, 10]} 1|2
HelpBattleRobot 50105026 baseHurt*hpCoefficient
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 33acecd..72e389a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -19,7 +19,7 @@
31031 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 5 35
31040 日常副本 1 0 360000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31080 仙界秘境 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31110 渡劫 1 0 220000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
+31110 渡劫 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
31130 符印塔 1 0 0 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
31140 冰晶矿脉 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31150 古神禁地 1 0 0 8 0 0 0 0 0 0 0 0 0 0 10000 50 50 1 1 0 5 32
@@ -31,8 +31,8 @@
31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
51010 娲皇遗迹 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
-60010 宗门试炼 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31180 混乱妖域 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+60010 宗门试炼 1 0 1500000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31180 混乱妖域 1 0 1500000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31160 上古战场 1 0 1200000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
52010 封魔坛 1 0 900000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
--
Gitblit v1.8.0