Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_LC

2018-09-25 6c2e4d11315a0b0574e08d6a1a199a1579a0279a

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -40,7 +40,7 @@
OpenJob    1|2    0    0    0    0

TeamReadyTime    30                

BossShunt    10040|21070    1    5        

MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]		
MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]    21070|21100|21110	
DropRecordValue    4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078                

DropRecordNum    40    1            

KillBossCntLimit    {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}    0_3|1_0|2_3    {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'}    {1:27}    {0:[21,'WorldBossNoHarm']}


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -205,7 +205,7 @@
AngryAdd    60    1    20    100    0

BossHomeCost    1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200    0    0    0    0

BossShunt    10040|21070    1    5        

MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]		
MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]    21070|21100|21110	
DungeonDeliver    31020|31030|31150                

DungeonIntegral    10000                

BuyFBCntCost    {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50"}                


 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt

@@ -151,3 +151,17 @@
xj.android.68    spxjgame    68    0    5

xj.android.128    spxjgame    128    0    7

xj.android.168    spxjgame    168    0    8

jkjk.18    mrgameios    18    101    0

jkjk.06    mrgameios    6    2    0

jkjk.030    mrgameios    30    103    0

jkjk.098    mrgameios    98    104    0

jkjk.0128    mrgameios    128    105    0

jkjk.0198    mrgameios    198    106    0

jkjk.0328    mrgameios    328    107    0

jkjk.0648    mrgameios    648    108    0

jkjk.1    mrgameios    1    110    0

jkjk.6    mrgameios    6    0    2

jkjk.30    mrgameios    30    0    4

jkjk.68    mrgameios    68    0    5

jkjk.128    mrgameios    128    0    7

jkjk.168    mrgameios    168    0    8