~admin/snxx_server.git

parent: ce357176 | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-08-22 e3d0ea19e886ad75d8eab373a0a62b00dcc7a541

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

5个文件已修改

	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagTreasureUp.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -109,7 +109,7 @@
2319    0        4609_1|4611_2|4612_2|4613_1|4614_1|4615_1                                

2320    0    4611_5|4612_5|4613_5|4614_5|4615_5                                    

2321    0        4611_1|4612_1|4613_1|4614_1|4615_1                                

2322    0            [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]    1						
2322    0        4611_1|4612_1|4613_1|4614_1|4615_1    [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]    2						
2323    0        4611_1|4612_1|4613_1|4614_1|4615_1    [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]    [[5000,3],[10000,4]]                        

2324    0        4611_2|4612_2|4613_2|4614_2|4615_2                                

2325    0        181_10                                

@@ -126,3 +126,4 @@
2339    0            [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]]    1                        

2340    0            [[5000,[181,5]],[6000,[181,6]],[7000,[181,7]],[8000,[181,8]],[9000,[181,9]],[10000,[181,10]]]    1                        

2341    0            [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]]    1                        

2342    0            [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]]    1						

 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -167,25 +167,25 @@
60203003    0    0    0    1    []    0    {}    0    {}    {}    []    []    {}    {}    {}    {}    {}    0    0    0    0    [1,1,1,[1011,10222,20222,30222,10211,20211,30211]]    []

60203004    0    190    0    0    [(600000,0),(1000000,(3,2,107))]    5    {(3,3,107):1000000}    1    {4:0,5:0}    {3:[(10000,0)]}    []    [5,3,3,[(10000,0)],107]    {987:1000000,2321:1000000}    {}    {}    {}    {}    0    0    0    0    []    []

60203005    0    190    0    0    [(600000,0),(1000000,(3,2,107))]    5    {(3,3,107):1000000}    1    {4:0,5:0}    {3:[(10000,0)]}    []    [5,3,3,[(10000,0)],107]    {987:1000000,2321:1000000}    {}    {}    {}    {}    0    0    0    0    []    []

60203006    0    210    0    0    [(500000,0),(1000000,(3,2,107))]    5    {(3,3,107):1200000,(3,4,107):40000}    1    {4:1,5:0}    {3:[(9200,0),(10000,1)],4:[(10000,1)]}    []    [5,3,3,[(10000,1)],107]    {987:1000000,2321:1000000}    {}    {}    {}    {}    0    0    0    0    []    []

60203007    0    230    0    0    [(500000,0),(1000000,(3,2,107))]    5    {(3,3,107):1200000,(3,4,107):40000}    1    {4:1,5:0}    {3:[(9200,0),(10000,1)],4:[(10000,1)]}    []    [5,3,3,[(10000,1)],107]    {987:1000000,2321:1000000}    {}    {5:2000000}    {}    {5:1}    0    0    0    0    []    []

60203008    0    255    0    0    [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))]    10    {(4,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:20000,3801:60000,2321:1000000}    {}    {5:4000000}    {}    {5:1}    0    0    0    0    []    []

60203009    0    280    0    0    [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))]    10    {(4,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:20000,3801:60000,2321:1000000}    {2321:2}    {}    {2:1140000}    {2:1}    0    0    0    0    []    []

60203010    0    305    0    0    [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))]    10    {(5,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:60000,4610:10000,2321:1000000}    {2321:2}    {}    {2:2500000}    {2:1}    0    0    0    0    []    []

60203011    0    330    0    0    [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))]    10    {(5,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000}    {2321:2}    {}    {2:3100000}    {2:1}    0    0    0    0    []    []

60203012    0    355    0    0    [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))]    10    {(6,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000}    {2321:2}    {}    {2:4100000}    {2:1}    0    0    0    0    []    []

60203013    0    380    0    0    [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))]    10    {(6,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,2321:1000000}    {2321:2}    {}    {2:5100000}    {2:1}    0    0    0    0    []    []

60203014    0    405    0    0    [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))]    10    {(7,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000}    {2321:2}    {}    {2:6600000}    {2:1}    0    0    0    0    []    []

60203015    0    430    0    0    [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))]    10    {(7,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000}    {2321:2}    {}    {2:8300000}    {2:1}    0    0    0    0    []    []

60203016    0    455    0    0    [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))]    10    {(8,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:10700000}    {2:1}    0    0    0    0    []    []

60203017    0    480    0    0    [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))]    10    {(8,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:13400000}    {2:1}    0    0    0    0    []    []

60203018    0    505    0    0    [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))]    10    {(9,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:17400000}    {2:1}    0    0    0    0    []    []

60203019    0    530    0    0    [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))]    10    {(9,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:21800000}    {2:1}    0    0    0    0    []    []

60203020    0    555    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(10,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:26160000}    {2:1}    0    0    0    0    []    []

60203021    0    580    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(10,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:31392000}    {2:1}    0    0    0    0    []    []

60203022    0    655    0    0    [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))]    15    {(11,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

60203023    0    680    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(11,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

60203024    0    705    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(12,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

60203006    0    210    0    0    [(500000,0),(1000000,(3,2,107))]    5    {(3,3,107):1200000,(3,4,107):40000}    1    {4:1,5:0}    {3:[(9200,0),(10000,1)],4:[(10000,1)]}    []    [5,3,3,[(10000,1)],107]    {987:1000000,2322:1000000}    {}    {}    {}    {}    0    0    0    0    []    []

60203007    0    230    0    0    [(500000,0),(1000000,(3,2,107))]    5    {(3,3,107):1200000,(3,4,107):40000}    1    {4:1,5:0}    {3:[(9200,0),(10000,1)],4:[(10000,1)]}    []    [5,3,3,[(10000,1)],107]    {987:1000000,2323:1000000}    {}    {}    {}    {5:1}    0    0    0    0    []    []

60203008    0    255    0    0    [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))]    10    {(4,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:20000,3801:60000,2324:1000000}    {}    {}    {}    {5:1}    0    0    0    0    []    []

60203009    0    280    0    0    [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))]    10    {(4,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:20000,3801:60000,2324:1000000}    {2321:2}    {}    {2:1140000}    {2:1}    0    0    0    0    []    []

60203010    0    305    0    0    [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))]    10    {(5,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:60000,4610:10000,2324:1000000}    {2321:2}    {}    {2:2500000}    {2:1}    0    0    0    0    []    []

60203011    0    330    0    0    [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))]    10    {(5,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000}    {2321:2}    {}    {2:3100000}    {2:1}    0    0    0    0    []    []

60203012    0    355    0    0    [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))]    10    {(6,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000}    {2321:2}    {}    {2:4100000}    {2:1}    0    0    0    0    []    []

60203013    0    380    0    0    [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))]    10    {(6,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,2324:1000000}    {2321:2}    {}    {2:5100000}    {2:1}    0    0    0    0    []    []

60203014    0    405    0    0    [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))]    10    {(7,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000}    {2321:2}    {}    {2:6600000}    {2:1}    0    0    0    0    []    []

60203015    0    430    0    0    [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))]    10    {(7,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000}    {2321:2}    {}    {2:8300000}    {2:1}    0    0    0    0    []    []

60203016    0    455    0    0    [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))]    10    {(8,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:10700000}    {2:1}    0    0    0    0    []    []

60203017    0    480    0    0    [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))]    10    {(8,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:13400000}    {2:1}    0    0    0    0    []    []

60203018    0    505    0    0    [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))]    10    {(9,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:17400000}    {2:1}    0    0    0    0    []    []

60203019    0    530    0    0    [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))]    10    {(9,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:21800000}    {2:1}    0    0    0    0    []    []

60203020    0    555    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(10,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:26160000}    {2:1}    0    0    0    0    []    []

60203021    0    580    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(10,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:31392000}    {2:1}    0    0    0    0    []    []

60203022    0    655    0    0    [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))]    15    {(11,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

60203023    0    680    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(11,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

60203024    0    705    0    0    [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))]    15    {(12,4,107):40000}    1    {4:1,5:0}    {3:[(8000,0),(10000,1)],4:[(10000,1)]}    []    []    {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000}    {2321:2}    {}    {2:37670400}    {2:1}    0    0    0    0    []    []

30903001    150    0    0    0    [(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))]    80    {(3,4,107):2000000}    1    {4:8,5:0}    {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []

30903001    200    0    0    0    [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))]    80    {(4,4,107):2000000}    1    {4:8,5:1}    {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []

30903001    250    0    0    0    [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))]    80    {(5,4,107):2000000}    1    {4:8,5:1}    {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -143,7 +143,7 @@
801    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

802    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

803    19    0    2213    1    1    []    0        0    0    0    0    1    80    0    0    

901    30    0    2322    1    1    []    0        7    0    0    0    27    50    0    0	
901    30    0    2342    1    1    []    0        7    0    0    0    27    50    0    0	
902    30    0    4658    1    1    []    0        7    0    0    2    27    500    0    0    

903    30    0    4738    1    1    []    0        7    0    0    3    27    800    0    0    

904    30    0    4735    1    1    []    0        7    0    0    1    27    1000    0    0    


 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt

@@ -52,6 +52,7 @@
213    0    0        50912|55912|60912        

214    0    0        50913|55913|60913        

301    0    0                

301    1    5				
302    0    0        47100|47100|47100        

304    0    0                

305    0    0    46_3000

			@@ -109,7 +109,7 @@
			2319 0 4609_1\|4611_2\|4612_2\|4613_1\|4614_1\|4615_1
			2320 0 4611_5\|4612_5\|4613_5\|4614_5\|4615_5
			2321 0 4611_1\|4612_1\|4613_1\|4614_1\|4615_1
			2322 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
			2322 0 4611_1\|4612_1\|4613_1\|4614_1\|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 2
			2323 0 4611_1\|4612_1\|4613_1\|4614_1\|4615_1 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] [[5000,3],[10000,4]]
			2324 0 4611_2\|4612_2\|4613_2\|4614_2\|4615_2
			2325 0 181_10
			@@ -126,3 +126,4 @@
			2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1
			2340 0 [[5000,[181,5]],[6000,[181,6]],[7000,[181,7]],[8000,[181,8]],[9000,[181,9]],[10000,[181,10]]] 1
			2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1
			2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1

			@@ -167,25 +167,25 @@
			60203003 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1011,10222,20222,30222,10211,20211,30211]] []
			60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
			60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
			60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
			60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {5:2000000} {} {5:1} 0 0 0 0 [] []
			60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {} {5:4000000} {} {5:1} 0 0 0 0 [] []
			60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
			60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2321:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
			60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:3100000} {2:1} 0 0 0 0 [] []
			60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:4100000} {2:1} 0 0 0 0 [] []
			60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2321:1000000} {2321:2} {} {2:5100000} {2:1} 0 0 0 0 [] []
			60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:6600000} {2:1} 0 0 0 0 [] []
			60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:8300000} {2:1} 0 0 0 0 [] []
			60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:10700000} {2:1} 0 0 0 0 [] []
			60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:13400000} {2:1} 0 0 0 0 [] []
			60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:17400000} {2:1} 0 0 0 0 [] []
			60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
			60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:26160000} {2:1} 0 0 0 0 [] []
			60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:31392000} {2:1} 0 0 0 0 [] []
			60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
			60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
			60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {} {} {} {5:1} 0 0 0 0 [] []
			60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
			60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2324:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
			60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000} {2321:2} {} {2:3100000} {2:1} 0 0 0 0 [] []
			60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2324:1000000} {2321:2} {} {2:4100000} {2:1} 0 0 0 0 [] []
			60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2324:1000000} {2321:2} {} {2:5100000} {2:1} 0 0 0 0 [] []
			60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000} {2321:2} {} {2:6600000} {2:1} 0 0 0 0 [] []
			60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2324:1000000} {2321:2} {} {2:8300000} {2:1} 0 0 0 0 [] []
			60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:10700000} {2:1} 0 0 0 0 [] []
			60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:13400000} {2:1} 0 0 0 0 [] []
			60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:17400000} {2:1} 0 0 0 0 [] []
			60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
			60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:26160000} {2:1} 0 0 0 0 [] []
			60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:31392000} {2:1} 0 0 0 0 [] []
			60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2324:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
			30903001 150 0 0 0 [(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))] 80 {(3,4,107):2000000} 1 {4:8,5:0} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
			30903001 200 0 0 0 [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))] 80 {(4,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
			30903001 250 0 0 0 [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))] 80 {(5,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []

			@@ -143,7 +143,7 @@
			801 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
			802 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
			803 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
			901 30 0 2322 1 1 [] 0 7 0 0 0 27 50 0 0
			901 30 0 2342 1 1 [] 0 7 0 0 0 27 50 0 0
			902 30 0 4658 1 1 [] 0 7 0 0 2 27 500 0 0
			903 30 0 4738 1 1 [] 0 7 0 0 3 27 800 0 0
			904 30 0 4735 1 1 [] 0 7 0 0 1 27 1000 0 0

			@@ -52,6 +52,7 @@
			213 0 0 50912\|55912\|60912
			214 0 0 50913\|55913\|60913
			301 0 0
			301 1 5
			302 0 0 47100\|47100\|47100
			304 0 0
			305 0 0 46_3000