parent: f57dc05a | 补丁 | 提交 | ignore whitespace
cehua_LC
2018-10-08 05efc787647e5e30741e5a8c438f2ec8907e88f0 
Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18
6个文件已修改
16 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagLVAward.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt


@@ -1,5 +1,5 @@


CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    IsDayReset



1    test1    []    2    3    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



2    test2    []    5    6    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



3    test3    []    8    9    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



1    test1    []    2018-5-29    2018-5-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



2    test2    []    2018-5-31    2018-5-1    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



3    test3    []    2018-5-2    2018-5-3    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0



4    tast4    [7001,7002,7003,8002,8003,8004]    2018-9-29    2018-9-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0





 CoreServerGroup/GameServer/Script/GM/Commands/Bossall.pyc

Binary files differ



 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc

Binary files differ



 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ



 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt


@@ -1,5 +1,5 @@


CfgID    StartDate    EndDate    LimitLV    IsDayReset    TemplateIDList



1    2    3    50    0    2



2    5    6    50    0    3



3    8    9    50    0    3



1    2018-5-29    2018-5-30    50    0    2



2    2018-5-31    2018-5-1    50    0    3



3    2018-5-2    2018-5-3    50    0    3



4    2018-9-29    2018-9-30    50    0    3





 db/PyMongoDataServer/PySysDB/tagLVAward.txt


@@ -1,6 +1,6 @@


RewardID    LV    LimitNUM    Reward    VIPLimit    VIPAward



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]]



1    60    0    {"1":[[922,1],[924,1],[911,1],[4151,2]],"2":[[922,1],[924,1],[911,1],[4151,2]],"3":[[922,1],[924,1],[911,1],[4151,2]]}    2    [[4151,10]]



2    80    0    {"1":[[3511,1],[1500,1],[923,1],[2107,1]],"2":[[3511,1],[1500,1],[923,1],[2107,1]],"3":[[3511,1],[1500,1],[923,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,60],[911,1]],"2":[[105,2],[102,5],[141,60],[911,1]],"3":[[105,2],[102,5],[141,60],[911,1]]}    2    [[1001,1]]



5    150    0    {"1":[[1501,1],[142,60],[151,1],[30,100]],"2":[[1501,1],[142,60],[151,1],[30,100]],"3":[[1501,1],[142,60],[151,1],[30,100]]}    3    [[5,1]]