Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

hwj35

5 天以前 aec346c22cdcccce04007911344178cd1a73bb15

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/GMToolLogicProcess/Commands/GMT_AddOrderInfoPayCompensation.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt

@@ -374,7 +374,7 @@
BillboardSet    []    {0:1000, 1:9999, 2:9999, 3:9999, 4:9999, 6:9999, 7:9999, 8:9999, 9:9999, 10:10000, 150:10000}    {}        

OSABillboard    {"3":[1, 3], "4":[2, 4], "8":[3, 5], "7":[4, 6], "9":[5, 7]}    {"1":[[5,40],[8,800],[3,800],[7,40000],[3002,1]],"2":[[5,30],[8,600],[3,600],[7,30000],[3003,1]],"3":[[5,20],[8,400],[3,400],[7,20000],[3004,1]],"5":[[5,15],[8,300],[3,300],[7,15000]],"10":[[5,10],[8,200],[3,200],[7,10000]],"20":[[5,8],[8,160],[3,160],[7,8000]],"50":[[5,6],[8,120],[3,120],[7,6000]],"100":[[5,4],[8,80],[3,80],[7,4000]],"200":[[5,4],[8,60],[3,60],[7,3000]],"2000":[[5,2],[8,40],[3,40],[7,2000]]}    {"1":[[1005,1],[1001,3],[7,40000],[1,2000],[3005,1]],"2":[[1013,40],[1001,3],[7,30000],[1,1800],[3006,1]],"3":[[1013,30],[1001,2],[7,20000],[1,1500],[3007,1]],"5":[[1013,20],[1001,2],[7,15000],[1,1000]],"10":[[1001,2],[7,10000],[1,800]],"20":[[1001,1],[7,8000],[1,500]],"50":[[1003,1],[7,6000],[1,400]],"100":[[1003,1],[7,4000],[1,200]],"200":[[1002,1],[7,3000],[1,150]],"2000":[[1002,1],[7,2000],[1,100]]}    {"1":[[202,120],[32,120],[200,500],[1,2000],[3011,1]],"2":[[202,100],[32,100],[200,400],[1,1800],[3012,1]],"3":[[202,80],[32,80],[200,300],[1,1500],[3013,1]],"5":[[202,60],[32,60],[200,250],[1,1000]],"10":[[201,100],[32,50],[200,220],[1,800]],"20":[[201,80],[32,40],[200,200],[1,500]],"50":[[201,60],[32,30],[200,180],[1,400]],"100":[[201,40],[32,20],[200,150],[1,200]],"200":[[201,30],[32,10],[200,100],[1,150]],"2000":[[201,20],[32,10],[200,50],[1,100]]}    

OSABillboardTrain    {"7":0.04, "8":10, "9":500, "10":100}    {"1":10, "2":25, "3":50, "4":200, "5":500}    {"1":[[1005,1],[10,100],[8,800],[1,2000],[3008,1]],"2":[[1013,40],[10,80],[8,600],[1,1800],[3009,1]],"3":[[1013,30],[10,60],[8,400],[1,1500],[3010,1]],"5":[[1013,20],[10,50],[8,300],[1,1000]],"10":[[10,40],[8,200],[1,800]],"20":[[10,35],[8,160],[1,500]],"50":[[10,30],[8,120],[1,400]],"100":[[10,20],[8,80],[1,200]],"200":[[10,10],[8,60],[1,150]],"2000":[[10,5],[8,40],[1,100]]}    10|100    {"1":[[31,160],[30,800],[1,2000],[10000,400],[3014,1]],"2":[[31,120],[30,600],[1,1800],[10000,300],[3015,1]],"3":[[31,80],[30,400],[1,1500],[10000,240],[3016,1]],"5":[[31,60],[30,300],[1,1000],[10000,160]],"10":[[31,40],[30,200],[1,800],[10000,100]],"20":[[31,32],[30,160],[1,500],[10000,50]],"50":[[31,24],[30,120],[1,400]],"100":[[31,16],[30,80],[1,200]],"200":[[31,12],[30,60],[1,150]],"2000":[[31,8],[30,40],[1,100]]}

OSACelebration    7    {"2000":[[3,100]],"4000":[[7,20000]],"6000":[[2,20000]],"9000":[[8,200]],"12000":[[1005,1]]}    20		
OSACelebration    7    {"2000":[[3,100]],"5000":[[4807,1]],"8000":[[8,200]],"12000":[[1005,10000]],"15000":[[3503,1]]}    20		
TalkCD    {"0":3,"3":3}                

TalkCache    {0:50, 1:0, 3:30}                

PlayerViewCache    50    7            


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt

@@ -593,7 +593,7 @@
2013020    2013020    1    1    仁德之主    2    2    1    2    0    1    1    3    0    28000    0    0    10000    5010    20130201    13        0                0                    0    4|1    0    0        0    0    0    0    0    60000

20130201    20130201    1    1    仁德    0    5    0    0    6    0    0    0    0    0    0    0    10000    67    3000|1            69    3000|1            0                    0            2        0    0    0    0    0    0

2013030    2013030    1    1    甘霂    3    2    0    2    0    1    1    1    0    12000    0    0    10000    5508    0|2500|5000    51    1    5010    20130301    13        5010    20130302    13            0    1    0    0        0    0    0    0    0    360000

20130301    20130301    1    1    移除    0                    0    0    0    0                10000    5004    [4,6]|1|1|2|10000    13																					
20130301    20130301    1    1    移除    0                    0    0    1    0                10000    5004    [4,6]|1|1|2|10000    13																					
20130302    20130302    1    1    减伤    0    5    0    0    6    0    0    0    0    0    0    0    10000    36    500                            0                    0        0    2        1    4    3    0    0    

2013050    2013050    1    1    白帝托孤    3    5    0    1003    0    1    0    6    0    30000    0    0    10000    5011        54    1                    0                    99        21    3        0    0    0    0    0    600000

2013070    2013070    1    1    桃园韫义    3    10                1        6                0    10000    5022    [56,2500,1]|[]|[102,56,2500,1]    23    3    6032    10|[4]    8    1    5011        40    1                                                840000


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Store.txt

@@ -44,12 +44,13 @@
300    5    3    5    []    0    50    0    55    20    0    0    0

301    5    12    2    []    0    20    0    55    30    0    0    0

302    5    2    500    []    0    40    0    55    40    0    0    0

303    5    7    1000    []    0    50    0    55    50    0    0    0

303    5    7    1000    []    0    25    0    55    50    0    0    0

304    5    8    20    []    0    5    0    55    200    0    0    0

305    5    6    3    []    0    5    0    55    300    0    0    0

306    5    13    4    []    0    4    0    55    400    0    0    0

307    5    5    5    []    0    5    0    55    500    0    0    0

308    5    11009    1    []    0    50    0    55    75    0    0    0

309    5    4510    1    []    0    1    0    55    1250    0    0    0

10001    4    3    10    []    1    1    0    1    0    50    0    0

10002    4    5    7    []    1    1    0    1    1588    1960    0    0

10003    17    3    10    []    1    1    0    1    0    50    0    0