~admin/snxx_server.git

parent: 581b6d3e | 补丁 | 提交 | show whitespace

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

cehua_wcy

2019-01-11 71f9adc511b819a0e6183df067f378e3c5acea22

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

9个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagDienstgrad.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/SysDB/tagChinItem.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -50,6 +50,7 @@
CreateRoleMap    {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}                

SetWorldPosShunt    {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10}    350            

DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]}    20303001    [20302002, 20302003]        

RandomRefreshNPC    {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60], 2:[[40108002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 3:[[40102001], [161], 8, 8, 7200], 4:[[40102002], [162], 8, 8, 7200], 5:[[40102003], [163], 8, 8, 7200], 6:[[40102004], [164], 8, 8, 7200], 7:[[40102005], [165], 8, 8, 7200], 8:[[40102006], [166], 8, 8, 7200], 9:[[40102007], [167], 8, 8, 7200]}}    [40108002, 40102001]			
XMZZBetCfg    {}                

XMZZAward    {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]}    []    [[992,1,1]]    [[993,1,1]]    500

XMZZDogFallLimit    1000                


 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt

@@ -107,3 +107,5 @@
158    300    0    0

159    300    0    0

160    1    0    0

161    1    0    0

162    1    0    0


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagChatBubbleBox.txt

@@ -2,3 +2,4 @@
0    1    0

1    0    2

2    0    6

3    1    0


 db/PyMongoDataServer/PySysDB/tagDienstgrad.txt

@@ -21,3 +21,4 @@
29    1    2592000    6|7    55944|2797    

30    1    2592000    6|7    44755|2237    

31    1    2592000    6|7    27972|1398    

32    1    0    6|7    30000|1500	

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -271,6 +271,7 @@
DogzAssist    3|6    5409    2|3|5    1_10|2_20|3_30|4_40|5_50|6_50    8352

DogzFBRefreshCfg    {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]}    20303001    [20302002, 20302003]        

DogzFBCollect    {20302001:2,20302002:2}    {20302001:2,20302002:4}            

RandomRefreshNPC    {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60], 2:[[40108002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 3:[[40102001], [161], 8, 8, 7200], 4:[[40102002], [162], 8, 8, 7200], 5:[[40102003], [163], 8, 8, 7200], 6:[[40102004], [164], 8, 8, 7200], 7:[[40102005], [165], 8, 8, 7200], 8:[[40102006], [166], 8, 8, 7200], 9:[[40102007], [167], 8, 8, 7200]}}    [40108002, 40102001]			
XMZZBetCfg    {}                

XMZZAward    {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]}    []    [[992,1,1]]    [[993,1,1]]    500

XMZZRobot    [30403002,30403003,30403004]    30403001            


 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt

@@ -107,3 +107,5 @@
158    300    0    0    0    0

159    300    0    0    0    0

160    1    0    0    0    0

161    1    0    0    0    0

162    1    0    0    0    0


 db/PyMongoDataServer/SysDB/tagChinItem.txt

@@ -59,6 +59,7 @@
59    1    0    绝骑武神    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    29    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    6    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

60    1    0    万服飞将    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    30    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

61    1    0    独步猛士    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    31    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

62    1    0    天选之人    4    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    1    0    50    0    1    0    0    204    32    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

101    1    0    初级生命神兵石    20    0    0    0    0    999    110    1    1    0    1    0    0    0    0    0    1    2    0    10    0    1    0    0    206    20    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

102    2    0    中级生命神兵石    20    0    0    0    0    999    110    1    1    0    1    0    0    0    0    0    1    12    0    20    0    1    0    0    206    120    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

103    3    0    高级生命神兵石    20    0    0    0    0    999    110    1    1    0    1    0    0    0    0    0    1    60    0    50    0    1    0    0    206    600    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

@@ -321,6 +322,7 @@
1600    1    0    后羿之魂    77    0    0    0    0    999    1    1    1    0    1    0    0    0    0    0    1    100    0    10    0    1    0    0    236    111    250    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1650    1    0    贵族气泡    16    0    0    0    0    999    1    1    1    0    1    0    0    0    0    0    1    100    0    10    0    1    0    0    237    1    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    4    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1651    1    0    至尊气泡    16    0    0    0    0    999    1    1    1    0    1    0    0    0    0    0    1    100    0    10    0    1    0    0    237    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    5    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1652    1    0    华丽卷轴    16    0    0    0    0    999    1    1    1    0    1    0    0    0    0    0    1    100    0    10    0    1    0    0    237    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    3    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1800    1    0    玄武之魂(黄)    22    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    3400    0    20    0    1    0    0    7    275    0    0    6    8264    0    0    15    300    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1801    1    0    应龙之魂(黄)    22    0    0    0    0    999    1    0    1    0    1    0    0    0    0    0    1    2570    0    20    0    1    0    0    7    275    0    0    6    8264    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

1802    1    0    朱雀之魂(黄)    22    0    1    0    0    999    1    1    1    0    1    0    0    0    0    0    1    1020    0    1000    0    1    0    0    7    991    0    0    6    29736    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    2    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0    0

			@@ -50,6 +50,7 @@
			CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
			SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
			DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
			RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60], 2:[[40108002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 3:[[40102001], [161], 8, 8, 7200], 4:[[40102002], [162], 8, 8, 7200], 5:[[40102003], [163], 8, 8, 7200], 6:[[40102004], [164], 8, 8, 7200], 7:[[40102005], [165], 8, 8, 7200], 8:[[40102006], [166], 8, 8, 7200], 9:[[40102007], [167], 8, 8, 7200]}} [40108002, 40102001]
			XMZZBetCfg {}
			XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
			XMZZDogFallLimit 1000

			@@ -107,3 +107,5 @@
			158 300 0 0
			159 300 0 0
			160 1 0 0
			161 1 0 0
			162 1 0 0

			@@ -21,3 +21,4 @@
			29 1 2592000 6\|7 55944\|2797
			30 1 2592000 6\|7 44755\|2237
			31 1 2592000 6\|7 27972\|1398
			32 1 0 6\|7 30000\|1500

			@@ -271,6 +271,7 @@
			DogzAssist 3\|6 5409 2\|3\|5 1_10\|2_20\|3_30\|4_40\|5_50\|6_50 8352
			DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
			DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
			RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150], 1, 20, 60], 2:[[40108002], [151,152,153,154,155,156,157,158,159,160], 1, 6, 7200], 3:[[40102001], [161], 8, 8, 7200], 4:[[40102002], [162], 8, 8, 7200], 5:[[40102003], [163], 8, 8, 7200], 6:[[40102004], [164], 8, 8, 7200], 7:[[40102005], [165], 8, 8, 7200], 8:[[40102006], [166], 8, 8, 7200], 9:[[40102007], [167], 8, 8, 7200]}} [40108002, 40102001]
			XMZZBetCfg {}
			XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
			XMZZRobot [30403002,30403003,30403004] 30403001

			@@ -107,3 +107,5 @@
			158 300 0 0 0 0
			159 300 0 0 0 0
			160 1 0 0 0 0
			161 1 0 0 0 0
			162 1 0 0 0 0

			@@ -59,6 +59,7 @@
			59 1 0 绝骑武神 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 29 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			60 1 0 万服飞将 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			61 1 0 独步猛士 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 31 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			62 1 0 天选之人 4 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 204 32 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			101 1 0 初级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 2 0 10 0 1 0 0 206 20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			102 2 0 中级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 12 0 20 0 1 0 0 206 120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			103 3 0 高级生命神兵石 20 0 0 0 0 999 110 1 1 0 1 0 0 0 0 0 1 60 0 50 0 1 0 0 206 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			@@ -321,6 +322,7 @@
			1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 236 111 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1650 1 0 贵族气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1651 1 0 至尊气泡 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1652 1 0 华丽卷轴 16 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 10 0 1 0 0 237 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1800 1 0 玄武之魂(黄) 22 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3400 0 20 0 1 0 0 7 275 0 0 6 8264 0 0 15 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1801 1 0 应龙之魂(黄) 22 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 2570 0 20 0 1 0 0 7 275 0 0 6 8264 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
			1802 1 0 朱雀之魂(黄) 22 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1020 0 1000 0 1 0 0 7 991 0 0 6 29736 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0