cehua_LC
2018-10-09 90155119ce8cd100b0ee2c217973ebed967c9a65
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
4个文件已修改
8 ■■■■ 已修改文件
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagChestsAward.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc
Binary files differ
db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -173,7 +173,7 @@
2386    0            [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]]    1    [[10000,[4251,1]]]    [[9000,0],[10000,1]]                    [4251]
2387    0        8353_1    [[1500,[8202,1]],[3000,[8215,1]],[4500,[8228,1]],[6000,[8241,1]],[7500,[8254,1]],[7800,[8203,1]],[8100,[8216,1]],[8400,[8229,1]],[8700,[8242,1]],[9000,[8255,1]],[9200,[8204,1]],[9400,[8217,1]],[9600,[8230,1]],[9800,[8243,1]],[10000,[8256,1]]]    4    [[740,[8354,1]],[2222,[8205,1]],[3703,[8218,1]],[5185,[8231,1]],[6666,[8244,1]],[8148,[8257,1]],[8481,[8206,1]],[8814,[8219,1]],[9148,[8232,1]],[9481,[8245,1]],[9814,[8258,1]],[9851,[8207,1]],[9888,[8220,1]],[9925,[8233,1]],[9962,[8246,1]],[10000,[8259,1]]]    [[7300,0],[10000,1]]                    [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259]
2388    0            [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]]    1                            
2389    0        8353_2    [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]]    7    [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]]    [[7750,0],[10000,1]]    {2:[[2000,[8208,1]],[4000,[8221,1]],[6000,[8234,1]],[8000,[8247,1]],[10000,[8260,1]]], 10:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]}                [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2389    0        8353_2    [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]]    7    [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]]    [[7750,0],[10000,1]]    {2:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]}                [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390                [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]]    1                            
2391                [[100,[3803,1]],[110,[5409,1]],[130,[8067,1]],[230,[3505,1]],[330,[3515,1]],[350,[4607,1]],[550,[4606,1]],[590,[4608,1]],[990,[3504,1]],[1390,[3514,1]],[2890,[4151,8]],[4390,[181,8]],[5900,[2324,1]],[7300,[3503,1]],[8700,[3513,1]],[8950,[142,60]],[9200,[143,45]],[9450,[144,30]],[9700,[153,15]],[10000,[5303,50]]]    1                            [5409,3803,8067,4607,4606,4608,3515,3505]
2392            4184_2|1145_15|952_3|913_2                                    
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -257,7 +257,7 @@
XMZZRobotSkill    {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}                
XMZZPKAward    [0,10,20,30,40,50,60,70,80,90]    addPer+100 + int(math.ceil(HPPer/10.0))    50    reExp*216*(100+addPer)/100    reExp*108
PayRMB    10                
OSCBillboardOpen    {"2":[20,1,2],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[6,6,6],"6":[1200000,7,7]}    10
OSCBillboardOpen    {"2":[20,1,2],"1":[200,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}    10
OSCRankRedpackAward    {1:80,(2,5):81}                
WeekResetSuccType    []                
InvestCost    {"1":[300],"2":[98],"3":[300,680,1280,1880]}                
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -7,7 +7,7 @@
3    6    {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
4    190    {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
4    180    {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}
5    5    {"1":[[3512,2],[3502,2]],"2":[[3512,2],[3502,2]],"3":[[3512,2],[3502,2]]}
5    4    {"1":[[3512,1],[3502,1]],"2":[[3512,1],[3502,1]],"3":[[3512,1],[3502,1]]}
5    6    {"1":[[3512,2],[3502,2]],"2":[[3512,2],[3502,2]],"3":[[3512,2],[3502,2]]}
5    5    {"1":[[3512,1],[3502,1]],"2":[[3512,1],[3502,1]],"3":[[3512,1],[3502,1]]}
6    1000000    {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
6    800000    {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}