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

tlk

7 天以前 f3eee5165d2ec3eaabc3e979dc1c087a1bf1c1a5

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

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_GiveMoney.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

@@ -37,16 +37,16 @@
3    1310    10    [[5,1]]    [[5,20]]    []

3    1410    11    [[5,1]]    [[5,20]]    []

3    1510    12    [[5,1]]    [[1000,1],[5,20]]    []

4    1    0    [[20,1]]    [[20,30],[21,50]]    []

4    3    1    [[20,1]]    [[20,30],[21,50]]    []

4    5    2    [[20,1]]    [[1006,50],[21,50]]    []

4    10    3    [[20,1]]    [[20,30],[21,50]]    []

4    15    4    [[20,1]]    [[20,30],[21,50]]    []

4    20    5    [[20,1]]    [[1006,50],[21,50]]    []

4    25    6    [[20,1]]    [[20,30],[21,50]]    []

4    30    7    [[20,1]]    [[20,30],[21,50]]    []

4    35    8    [[20,1]]    [[20,30],[21,50]]    []

4    40    9    [[20,1]]    [[1006,50],[21,50]]    []

4    1    0    [[20,1]]    [[20,30],[21,500]]    []

4    3    1    [[20,1]]    [[20,30],[21,500]]    []

4    5    2    [[20,1]]    [[1006,50],[21,500]]    []

4    10    3    [[20,1]]    [[20,30],[21,500]]    []

4    15    4    [[20,1]]    [[20,30],[21,500]]    []

4    20    5    [[20,1]]    [[1006,50],[21,500]]    []

4    25    6    [[20,1]]    [[20,30],[21,500]]    []

4    30    7    [[20,1]]    [[20,30],[21,500]]    []

4    35    8    [[20,1]]    [[20,30],[21,500]]    []

4    40    9    [[20,1]]    [[1006,50],[21,500]]    []

5    10    0    [[6,3]]    [[12,50],[13,10]]    []

5    20    1    [[12,10]]    [[8,300]]    []

5    30    2    [[6,3]]    [[8,400],[7,50000]]    []


 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Zhanling.txt

@@ -37,16 +37,16 @@
3    1310    10    [[5,1]]    [[5,20]]    []

3    1410    11    [[5,1]]    [[5,20]]    []

3    1510    12    [[5,1]]    [[1000,1],[5,20]]    []

4    1    0    [[20,1]]    [[20,30],[21,50]]    []

4    3    1    [[20,1]]    [[20,30],[21,50]]    []

4    5    2    [[20,1]]    [[1006,50],[21,50]]    []

4    10    3    [[20,1]]    [[20,30],[21,50]]    []

4    15    4    [[20,1]]    [[20,30],[21,50]]    []

4    20    5    [[20,1]]    [[1006,50],[21,50]]    []

4    25    6    [[20,1]]    [[20,30],[21,50]]    []

4    30    7    [[20,1]]    [[20,30],[21,50]]    []

4    35    8    [[20,1]]    [[20,30],[21,50]]    []

4    40    9    [[20,1]]    [[1006,50],[21,50]]    []

4    1    0    [[20,1]]    [[20,30],[21,500]]    []

4    3    1    [[20,1]]    [[20,30],[21,500]]    []

4    5    2    [[20,1]]    [[1006,50],[21,500]]    []

4    10    3    [[20,1]]    [[20,30],[21,500]]    []

4    15    4    [[20,1]]    [[20,30],[21,500]]    []

4    20    5    [[20,1]]    [[1006,50],[21,500]]    []

4    25    6    [[20,1]]    [[20,30],[21,500]]    []

4    30    7    [[20,1]]    [[20,30],[21,500]]    []

4    35    8    [[20,1]]    [[20,30],[21,500]]    []

4    40    9    [[20,1]]    [[1006,50],[21,500]]    []

5    10    0    [[6,3]]    [[12,50],[13,10]]    []

5    20    1    [[12,10]]    [[8,300]]    []

5    30    2    [[6,3]]    [[8,400],[7,50000]]    []