From 53ad98340d29225844c45ce8cadebbc94e03cfd6 Mon Sep 17 00:00:00 2001 From: cehua_TRX <526616766@qq.com> Date: 星期三, 28 十一月 2018 09:50:05 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 18 +++++++++--------- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +- db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc | 0 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc index fd213f7..2144d5a 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc index b2f7582..cf0cdb4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 21c8f86..498126e 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -104,7 +104,7 @@ 2310 0 [[71,[10531,1]],[142,[10532,1]],[213,[10533,1]],[284,[10534,1]],[355,[10535,1]],[426,[10536,1]],[497,[10537,1]],[630,[10541,1]],[763,[10542,1]],[896,[10543,1]],[1029,[10544,1]],[1162,[10545,1]],[1295,[10546,1]],[1428,[10547,1]],[2652,[10521,1]],[3876,[10522,1]],[5100,[10523,1]],[6324,[10524,1]],[7548,[10525,1]],[8772,[10526,1]],[10000,[10527,1]]] 6 [[914,[10551,1]],[1828,[10552,1]],[2742,[10553,1]],[3656,[10554,1]],[4570,[10555,1]],[5484,[10556,1]],[6398,[10557,1]],[10000,[0,0]]] 1 [[10531,20531,30531],[10532,20532,30532],[10533,20533,30533],[10534,20534,30534],[10535,20535,30535],[10536,20536,30536],[10537,20537,30537],[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547],[10521,20521,30521],[10522,20522,30522],[10523,20523,30523],[10524,20524,30524],[10525,20525,30525],[10526,20526,30526],[10527,20527,30527],[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]] [10551,10552,10553,10554,10555,10556,10557,20551,20552,20553,20554,20555,20556,20557,30551,30552,30553,30554,30555,30556,30557] 2311 0 [[380,[10621,1]],[760,[10622,1]],[1140,[10623,1]],[1520,[10624,1]],[1900,[10625,1]],[2280,[10626,1]],[2660,[10627,1]],[2755,[10631,1]],[2850,[10632,1]],[2945,[10633,1]],[3040,[10634,1]],[3135,[10635,1]],[3230,[10636,1]],[3325,[10637,1]],[3372,[10641,1]],[3419,[10642,1]],[3466,[10643,1]],[3513,[10644,1]],[3560,[10645,1]],[3607,[10646,1]],[3654,[10647,1]],[4560,[10611,1]],[5466,[10612,1]],[6372,[10613,1]],[7278,[10614,1]],[8184,[10615,1]],[9090,[10616,1]],[10000,[10617,1]]] 6 [[285,[10651,1]],[570,[10652,1]],[855,[10653,1]],[1140,[10654,1]],[1425,[10655,1]],[1710,[10656,1]],[1995,[10657,1]],[2052,[10671,1]],[2109,[10672,1]],[2166,[10673,1]],[2223,[10674,1]],[2280,[10675,1]],[2337,[10676,1]],[2394,[10677,1]],[10000,[0,0]]] 1 [[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677] 2312 0 [[457,[10621,1]],[914,[10622,1]],[1371,[10623,1]],[1828,[10624,1]],[2285,[10625,1]],[2742,[10626,1]],[3199,[10627,1]],[3313,[10631,1]],[3427,[10632,1]],[3541,[10633,1]],[3655,[10634,1]],[3769,[10635,1]],[3883,[10636,1]],[3997,[10637,1]],[4054,[10641,1]],[4111,[10642,1]],[4168,[10643,1]],[4225,[10644,1]],[4282,[10645,1]],[4339,[10646,1]],[4396,[10647,1]],[5196,[10611,1]],[5996,[10612,1]],[6796,[10613,1]],[7596,[10614,1]],[8396,[10615,1]],[9196,[10616,1]],[10000,[10617,1]]] 10 [[571,[10651,1]],[1142,[10652,1]],[1713,[10653,1]],[2284,[10654,1]],[2855,[10655,1]],[3426,[10656,1]],[3997,[10657,1]],[4111,[10671,1]],[4225,[10672,1]],[4339,[10673,1]],[4453,[10674,1]],[4567,[10675,1]],[4681,[10676,1]],[4795,[10677,1]],[10000,[0,0]]] 1 [[10621,20621,30621],[10622,20622,30622],[10623,20623,30623],[10624,20624,30624],[10625,20625,30625],[10626,20626,30626],[10627,20627,30627],[10631,20631,30631],[10632,20632,30632],[10633,20633,30633],[10634,20634,30634],[10635,20635,30635],[10636,20636,30636],[10637,20637,30637],[10641,20641,30641],[10642,20642,30642],[10643,20643,30643],[10644,20644,30644],[10645,20645,30645],[10646,20646,30646],[10647,20647,30647],[10611,20611,30611],[10612,20612,30612],[10613,20613,30613],[10614,20614,30614],[10615,20615,30615],[10616,20616,30616],[10617,20617,30617],[10651,20651,30651],[10652,20652,30652],[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10671,20671,30671],[10672,20672,30672],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]] [10651,10652,10653,10654,10655,10656,10657,20651,20652,20653,20654,20655,20656,20657,30651,30652,30653,30654,30655,30656,30657,10671,10672,10673,10674,10675,10676,10677,20671,20672,20673,20674,20675,20676,20677,30671,30672,30673,30674,30675,30676,30677] -2317 0 109_5|106_5|103_5 +2317 0 109_5|103_2 2318 0 4611_2|4612_2|4613_2|4614_2|4615_2 2319 0 4609_1|4611_2|4612_2|4613_2|4614_2|4615_2 2320 0 4611_5|4612_5|4613_5|4614_5|4615_5 diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index 5152ace..e3ff2c6 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -99,18 +99,18 @@ 50103005 1 3 1 372500 10000 0 8000 2 9900 50 1 0 0 1020 0 50103006 1 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0 50103007 1 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0 -31401002 0 2 0 2700 10000 0 8000 3 9900 50 24 0 0 0 0 -31403002 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 +31401002 0 2 0 2400 10000 0 8000 3 9900 50 24 0 0 0 0 +31403002 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0 31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0 -31403003 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0 +31403003 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0 31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0 -31403004 0 2 0 2800 10000 0 8000 3 9900 50 1 0 0 50 0 -31401005 0 2 0 2600 10000 0 8000 3 9900 50 12 0 0 0 0 -31403005 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0 +31403004 0 2 0 2200 10000 0 8000 3 9900 50 1 0 0 50 0 +31401005 0 2 0 2000 10000 0 8000 3 9900 50 12 0 0 0 0 +31403005 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0 31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0 31403006 0 2 0 2400 10000 0 8000 3 9900 50 1 0 0 50 0 31401007 0 2 0 1600 10000 0 8000 3 9900 50 12 0 0 0 0 -31403007 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0 +31403007 0 2 0 4500 10000 0 8000 3 9900 50 1 0 0 50 0 31401008 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0 -31403008 0 2 0 2000 10000 0 8000 3 9900 50 1 0 0 50 0 -31401009 0 2 0 2800 10000 0 8000 3 9900 50 12 0 0 0 0 +31403008 0 2 0 1900 10000 0 8000 3 9900 50 1 0 0 50 0 +31401009 0 2 0 2000 10000 0 8000 3 9900 50 12 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 1de9c83..7a39f54 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -660,7 +660,7 @@ 23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 5000 0 0 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23043 冰晶矿脉减少攻击 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 23044 冰晶矿脉增加攻击 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 -23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 200 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 100 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23046 冰晶矿脉沉默 23046 1 1 0 0 2000 1 0 0 2 5 41 6 0 30000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 -- Gitblit v1.8.0