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

hwj35

2 天以前 eb41c2120ce1279ce70b514c656687495ae2e76b

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

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

@@ -32,3 +32,12 @@
11    200    5    [[5,8],[1009,25],[7,5000]]

11    300    6    [[5,8],[1009,50],[7,7000]]

11    400    7    [[5,8],[1013,50],[7,10000]]

12    10    0    [[20,1],[1030,10],[1026,8]]

12    30    1    [[20,4],[1030,15],[1026,10]]

12    60    2    [[20,6],[1030,25],[1026,14]]

12    100    3    [[20,8],[1031,25],[1026,18]]

12    150    4    [[20,8],[1031,25],[1026,23]]

12    200    5    [[20,8],[1006,25],[1026,20]]

12    300    6    [[20,8],[1006,25],[1026,25]]

12    400    7    [[20,8],[1006,50],[1026,25]]

12    600    8    [[20,8],[1033,25],[1026,50]]


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

@@ -3,3 +3,4 @@
2    1    1    8        12    1010

10    2    5    5    [3007,3008,3009,3010,3011,3012,3013]    13    1012

11    2    12    5    [3014,3015,3016,3017,3018,3019,3020]    14    1011

12    2    6    5    [3007,3008,3009,3010,3011,3012,3013]    13    1012