~admin/snxx_server.git

parent: be600c8c | 补丁 | 提交 | show whitespace

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

cehua-TT

2019-01-15 4cdaee035e0bf3d780aae2a93f36e3f3e08c83d7

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

5个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagStore.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagStore.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagStore.txt

@@ -40,6 +40,7 @@
71    2    0    0

72    2    0    0

73    2    0    0

74    2    0    0

101    3    0    0

103    3    0    0

104    3    0    0


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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -227,3 +227,4 @@
2438            101_50|2437_1                                    

2439        8209_1|8222_1|8235_1|8248_1|8261_1                                        [8209,8222,8235,8248,8261]

2440            2439_1                                    [2439]

2441            6006_1|6007_1|6008_1                        [[6006,6206],[6007,6207],[6008,6208]]			

 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -40,6 +40,7 @@
71    2    0    5411    1    0    []    0        0    0    260    0    0    1    100    0    0        

72    2    0    4103    1    0    []    0        0    0    270    0    0    1    280    0    0        

73    2    0    4104    1    0    []    0        0    0    270    0    0    1    180    0    0        

74    2    0    2441    1    0    []    0        0    0    0    0    0    1    680    0    0		
101    3    0    181    1    0    []    0        0    0    0    0    0    1    10    0    0        

103    3    0    3501    1    0    []    0        0    0    0    0    0    1    10    0    0        

104    3    0    3511    1    0    []    0        0    0    0    0    0    1    10    0    0

			@@ -40,6 +40,7 @@
			71 2 0 0
			72 2 0 0
			73 2 0 0
			74 2 0 0
			101 3 0 0
			103 3 0 0
			104 3 0 0

			@@ -227,3 +227,4 @@
			2438 101_50\|2437_1
			2439 8209_1\|8222_1\|8235_1\|8248_1\|8261_1 [8209,8222,8235,8248,8261]
			2440 2439_1 [2439]
			2441 6006_1\|6007_1\|6008_1 [[6006,6206],[6007,6207],[6008,6208]]

			@@ -40,6 +40,7 @@
			71 2 0 5411 1 0 [] 0 0 0 260 0 0 1 100 0 0
			72 2 0 4103 1 0 [] 0 0 0 270 0 0 1 280 0 0
			73 2 0 4104 1 0 [] 0 0 0 270 0 0 1 180 0 0
			74 2 0 2441 1 0 [] 0 0 0 0 0 0 1 680 0 0
			101 3 0 181 1 0 [] 0 0 0 0 0 0 1 10 0 0
			103 3 0 3501 1 0 [] 0 0 0 0 0 0 1 10 0 0
			104 3 0 3511 1 0 [] 0 0 0 0 0 0 1 10 0 0