cehua_wcy
2018-09-22 1d7e68edce21571dfb1aa1de47cbf59848fe5fec
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
28个文件已修改
10 ■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/SetOpenServerWeekday.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GM/Commands/SetWorldLV.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorld.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_550.pyc 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -2,7 +2,7 @@
1    OpenServer01    []    2    2            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    50    0
2    OpenServer02    []    4    4            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    50    0
3    OpenServer03    []    6    6            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    50    0
4    OpenServer04    []    7    7            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    180    0
4    OpenServer04    []    7    7            0    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    180    0
5    OpenServer05    []    10    10            120    {0:["LimitGift1",[]]}    {-60:["LimitGift2",[]]}    [30, "LimitGift1"]    280    0
6    NationalDay    []    2018-9-1    2018-9-3            1440    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [30, "LimitGift2"]    50    1
7    NationalDay    [(1,10), (100, 110), 120]    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    1440    {0:["LimitGift1",[]]}    {-30:["LimitGift2",[]]}    [240, "LimitGift2"]    50    1
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -30,7 +30,7 @@
FamilyBossOpen    31210    7000    20|22    5    0
FamilyStoreSpace    139    0    0    0    0
PartyReward    [(26,12800,1)]    [200,0]    ["PartyKing",1,[(28,25,1)]]    1    
FamilyMatchSet    3    0    0    0    0
FamilyMatchSet    2    0    0    0    0
FamilyMatchRankReward    {1:[[28,80,1,0],[26,59400,1,0]],4:[[28,64,1,0],[26,49500,1,0]],10:[[28,56,1,0],[26,39600,1,0]],20:[[28,48,1,0],[26,29700,1,0]],21:[[28,40,1,0],[26,19800,1,0]]}    [40,50,60,80,100]    [[103,5,1],[26,13200,1]]        
FamilyMatchLianWinReward    [[2278,1,0]]    3    3        
FamilyMatchOtherReward    [[28,60,1],[26,28000,1]]    [60,70,80,90,100]    5        
@@ -46,7 +46,7 @@
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']}
CreateRoleMap    {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}                
SetWorldPosShunt    {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25}    160            
DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'30',42,42,42]}    20303001    [20302002, 20302003]
DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]}    20303001    [20302002, 20302003]
XMZZBetCfg    {}                
XMZZAward    {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]}    []    [[992,1,1]]    [[993,1,1]]    500
XMZZDogFallLimit    1000                
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/SetOpenServerWeekday.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GM/Commands/SetWorldLV.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorld.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.pyc
Binary files differ
CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_550.pyc
Binary files differ
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -2,7 +2,7 @@
1    2    2            120    50    0    [[2]]    SellMail4    [[181,2,1],[4151,2,1]]
2    4    4            120    50    0    [[4]]    SellMail4    [[181,2,1],[4151,2,1]]
3    6    6            120    50    0    [[1]]    SellMail4    [[181,2,1],[4151,2,1]]
4    7    7            120    180    0    [[3]]    SellMail4    [[181,2,1],[4151,2,1]]
4    7    7            0    180    0    [[3]]    SellMail4    [[181,2,1],[4151,2,1]]
5    10    10            120    280    0    [[5]]    SellMail4    [[181,2,1],[4151,2,1]]
6    2018-9-1    2018-9-3            1440    50    1    [[1,2,3]]    SellMail4    [[13,2,1],[2,2,1]]
7    2018-9-1    2018-9-3    12:00|18:00    13:00|19:00    1440    50    1    [[3]]    SellMail4    [[13,2,1],[2,2,1]]
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -248,7 +248,7 @@
OutOfPrintValue    int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))                
BossStoneDelayTime    1500                
DogzAssist    3|6    5409    2|3|5    1_10|2_20|3_30|4_40|5_50|6_50    8352
DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'30',42,42,42]}    20303001    [20302002, 20302003]
DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'14400',8,8,8], (161,162,163,164,165,166,167):[20302003,6,'14400',42,42,42]}    20303001    [20302002, 20302003]
DogzFBCollect    {20302001:2,20302002:2}    {20302001:2,20302002:3}            
XMZZBetCfg    {}                
XMZZAward    {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]}    []    [[992,1,1]]    [[993,1,1]]    500