Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-TT

2018-08-14 49dad0b92ade225884453714ee3d4c79a9b283c4

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 ZoneServerGroup/RouteServer/ChinRouteServer.exe

Binary files differ

 ZoneServerGroup/RouteServer/ChinRouteServer.map

Diff too large

 ZoneServerGroup/RouteServer/ChinRouteServer.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagAlchemy.txt

@@ -1,7 +1,7 @@
AlchemyID    MaterialAll    AlchemyEXP    AlchemyItem    SpecialItem    AlchemyIUp    BlastFurnaceLV

101    4611_1|4613_1|4612_1|4614_1|4615_1    50    [[10000,4706,1]]        []    1

102    4611_2|4613_1|4612_2|4614_1|4615_1    84    [[5000,4707,1],[5000,4716,1]]    1    []    2

103    4611_2|4613_2|4612_2|4614_2|4615_2    144    [[4807,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1]]    11    []    3

103    4611_2|4613_2|4612_2|4614_2|4615_2    144    [[4682,4712,1],[1603,4708,1],[1667,4717,1],[1923,4721,1],[125,4740,1]]    11    []    3

104    4611_3|4613_3|4612_3|4614_3|4615_3    260    [[3761,4713,1],[1294,4709,1],[1333,4718,1],[1552,4722,1],[1940,4725,1],[24,4656,1],[24,4657,1],[24,4664,1],[24,4669,1],[24,4670,1],[24,4674,1],[24,4675,1],[56,4730,1]]    21|31    []    4

105    4611_4|4613_4|4612_4|4614_4|4615_4    415    [[3305,4714,1],[1180,4710,1],[1111,4719,1],[1416,4723,1],[1573,4726,1],[1180,4728,1],[42,4670,1],[42,4671,1],[42,4685,1],[42,4686,1],[67,4731,1]]    22|32    []    5

106    4611_5|4613_5|4612_5|4614_5|4615_5    622    [[3246,4715,1],[1193,4711,1],[1111,4720,1],[1432,4724,1],[1491,4727,1],[1193,4729,1],[42,4654,1],[42,4705,1],[125,4732,1],[125,4733,1],[42,4694,1],[42,4695,1]]    41    []    6


 db/PyMongoDataServer/PySysDB/tagAttrFruit.txt

@@ -63,6 +63,7 @@
4724    2    24    625

4727    2    25    625

4729    2    20    625

4740    2    1    1000

4730    2    2    1000

4731    2    2    1000

4732    2    5    1000


 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt

@@ -41,7 +41,6 @@
lxj.198    508021130    198    106    0

lxj.328    508021130    328    107    0

lxj.648    508021130    648    108    0

lxj.3000    508021130    3000    109    0

lxj.01    508021130    1    110    0

lxj.1.a    508021130    1    0    1

lxj.6.a    508021130    6    0    2


 db/PyMongoDataServer/PySysDB/tagRefineStove.txt

@@ -1,7 +1,7 @@
LV    Exp    AttrID    AttrValue

1    150    6    2000

2    840    6    10000

3    4320    6    17800

4    12960    6    38500

5    37325    6    59600

6    74650    6    97800

1    150    6    4119

2    840    6    8124

3    4320    6    13441

4    10368    6    20537

5    33177    6    29971

6    82944    6    42393