~admin/snxx_server.git

parent: 9e9799ae | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-09-18 9628b8cb6071def6da5932587d7fe63774505296

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

4个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagChestsAward.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -16,7 +16,7 @@
RealmFBHelpAward    ["RealmFBHelp",3,[(101,3,1)]]                

RealmFBHelpAttr    {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}    10000    6        

RealmFBHelpLimit    10                

GlobalDropCD    {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}    {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]},50103004:{1:[0,[222,222,222,222],[]]},50103005:{1:[0,[4250,4250,4250,4250],[]]}}    0    0    0

GlobalDropCD    {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}    {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}}    0    0    0

NPCGlobalDropRate    {3806:[[101,102],"10000+killedCnt*20000"]}    0    0    0    0

CreateFamilyMinLV    65    0    0    0    0

CreateFamilyNeedMoney    100    5    0    0    0


 db/PyMongoDataServer/PySysDB/tagChestsAward.txt

@@ -167,3 +167,7 @@
2380    0            [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]]    1                        

2381    0            [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[10000,[4609,1]]]    1                        [4609]

2382    0            [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[9995,[4609,1]],[10000,[4610,1]]]    1                        [4609,4610]

2383    0            [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]]    1    [[10000,[222,1]]    [[9000,0],[10000,1]]                [222]

2384    0            [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]]    1    [[10000,[4250,1]]    [[9000,0],[10000,1]]                [4250]

2385    0            [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]]    1    [[10000,[223,1]]    [[9000,0],[10000,1]]                [223]

2386    0            [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]]    1    [[10000,[4251,1]]    [[9000,0],[10000,1]]                [4251]


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -99,7 +99,7 @@
EquipSuitColorStar    {"1":[4,1],"2":[5,2]}    2            

EquipSuitMaxLv    {"3":{"1":8,"2":8},"4":{"1":8,"2":8},"5":{"1":8,"2":8},"6":{"1":8,"2":8},"7":{"1":8,"2":8},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}                

EquipSuitType    {"1":[3,4,5,6,7],"2":[8,9,10]}                

GlobalDropCD    {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}    {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]},50103004:{1:[0,[222,222,222,222],[]]},50103005:{1:[0,[4250,4250,4250,4250],[]]}}    0    0    0

GlobalDropCD    {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160}    {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}}    0    0    0

NPCGlobalDropRate    {3806:[[101,102],"10000+killedCnt*20000"]}    0    0    0    0

GoldModel    [(500,2100),(2000,2101),(10000,2102)]    0    0    0    0

MapItemProtectTime    60000    0    0    0    0


 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt

@@ -222,10 +222,10 @@
20303005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000}    {}    {}    25    800    1129    1694    []    [958]

20303006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000}    {}    {}    25    800    1356    1824    []    [958]

20303007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000}    {}    {}    25    800    1356    1824    []    [958]

50103001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4202:250000,4253:1000000,4151:1000000,2379:1000000}    {4253:5,4151:30,2379:2}    {}    {}    {}    0    0    0    0    []    [1023]

50103002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {250:125000,224:1000000,181:1000000,2380:1000000}    {224:5,181:40,2380:3}    {}    {}    {}    0    0    0    0    []    [1023]

50103003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4213:125000,4252:1000000,4151:1000000,2379:1000000}    {4252:5,4151:40,2379:3}    {}    {}    {}    0    0    0    0    []    [1023]

50103004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {260:83333,222:1000000,181:1000000,2380:1000000}    {222:5,181:50,2380:5}    {}    {}    {}    0    0    0    0    []    [1023]

50103005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4209:83333,4250:1000000,4151:1000000,2379:1000000}    {4250:5,4151:50,2379:5}    {}    {}    {}    0    0    0    0    []    [1023]

50103006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {258:62500,223:1000000,181:1000000,2380:1000000}    {223:5,181:60,2380:6}    {}    {}    {}    0    0    0    0    []    [1023]

50103007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4210:62500,4251:1000000,4151:1000000,2379:1000000}    {4251:5,4151:60,2379:6}    {}    {}    {}    0    0    0    0    []    [1023]

50103001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4202:62500,4253:1000000,4151:1000000,2379:1000000}    {4253:3,4151:30,2379:2}    {}    {}    {}    0    0    0    0    []    [1023]

50103002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {250:31250,224:1000000,181:1000000,2380:1000000}    {224:5,181:40,2380:3}    {}    {}    {}    0    0    0    0    []    [1023]

50103003    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4213:31250,4252:1000000,4151:1000000,2379:1000000}    {4252:5,4151:40,2379:3}    {}    {}    {}    0    0    0    0    []    [1023]

50103004    0    0    0    0    []    0    {}    0    {}    {}    []    []    {260:20833,222:1000000,181:1000000,2383:1000000}    {222:3,181:50,2383:6}    {}    {}    {}    0    0    0    0    []    [1023]

50103005    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4209:20833,4250:1000000,4151:1000000,2384:1000000}    {4250:3,4151:50,2384:6}    {}    {}    {}    0    0    0    0    []    [1023]

50103006    0    0    0    0    []    0    {}    0    {}    {}    []    []    {258:4166,223:1000000,181:1000000,2385:1000000}    {223:3,181:60,2385:8}    {}    {}    {}    0    0    0    0    []    [1023]

50103007    0    0    0    0    []    0    {}    0    {}    {}    []    []    {4210:4166,4251:1000000,4151:1000000,2386:1000000}    {4251:3,4151:60,2386:8}    {}    {}    {}    0    0    0    0    []    [1023]

			@@ -16,7 +16,7 @@
			RealmFBHelpAward ["RealmFBHelp",3,[(101,3,1)]]
			RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
			RealmFBHelpLimit 10
			GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]},50103004:{1:[0,[222,222,222,222],[]]},50103005:{1:[0,[4250,4250,4250,4250],[]]}} 0 0 0
			GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
			NPCGlobalDropRate {3806:[[101,102],"10000+killedCnt*20000"]} 0 0 0 0
			CreateFamilyMinLV 65 0 0 0 0
			CreateFamilyNeedMoney 100 5 0 0 0

			@@ -167,3 +167,7 @@
			2380 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1
			2381 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[10000,[4609,1]]] 1 [4609]
			2382 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[9995,[4609,1]],[10000,[4610,1]]] 1 [4609,4610]
			2383 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[222,1]] [[9000,0],[10000,1]] [222]
			2384 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4250,1]] [[9000,0],[10000,1]] [4250]
			2385 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1 [[10000,[223,1]] [[9000,0],[10000,1]] [223]
			2386 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1 [[10000,[4251,1]] [[9000,0],[10000,1]] [4251]

			@@ -99,7 +99,7 @@
			EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
			EquipSuitMaxLv {"3":{"1":8,"2":8},"4":{"1":8,"2":8},"5":{"1":8,"2":8},"6":{"1":8,"2":8},"7":{"1":8,"2":8},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}
			EquipSuitType {"1":[3,4,5,6,7],"2":[8,9,10]}
			GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]},50103004:{1:[0,[222,222,222,222],[]]},50103005:{1:[0,[4250,4250,4250,4250],[]]}} 0 0 0
			GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
			NPCGlobalDropRate {3806:[[101,102],"10000+killedCnt*20000"]} 0 0 0 0
			GoldModel [(500,2100),(2000,2101),(10000,2102)] 0 0 0 0
			MapItemProtectTime 60000 0 0 0 0

			@@ -222,10 +222,10 @@
			20303005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000} {} {} 25 800 1129 1694 [] [958]
			20303006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000} {} {} 25 800 1356 1824 [] [958]
			20303007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000} {} {} 25 800 1356 1824 [] [958]
			50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2379:1000000} {4253:5,4151:30,2379:2} {} {} {} 0 0 0 0 [] [1023]
			50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2380:1000000} {224:5,181:40,2380:3} {} {} {} 0 0 0 0 [] [1023]
			50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2379:1000000} {4252:5,4151:40,2379:3} {} {} {} 0 0 0 0 [] [1023]
			50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2380:1000000} {222:5,181:50,2380:5} {} {} {} 0 0 0 0 [] [1023]
			50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2379:1000000} {4250:5,4151:50,2379:5} {} {} {} 0 0 0 0 [] [1023]
			50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2380:1000000} {223:5,181:60,2380:6} {} {} {} 0 0 0 0 [] [1023]
			50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2379:1000000} {4251:5,4151:60,2379:6} {} {} {} 0 0 0 0 [] [1023]
			50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:62500,4253:1000000,4151:1000000,2379:1000000} {4253:3,4151:30,2379:2} {} {} {} 0 0 0 0 [] [1023]
			50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:31250,224:1000000,181:1000000,2380:1000000} {224:5,181:40,2380:3} {} {} {} 0 0 0 0 [] [1023]
			50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:31250,4252:1000000,4151:1000000,2379:1000000} {4252:5,4151:40,2379:3} {} {} {} 0 0 0 0 [] [1023]
			50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:20833,222:1000000,181:1000000,2383:1000000} {222:3,181:50,2383:6} {} {} {} 0 0 0 0 [] [1023]
			50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:20833,4250:1000000,4151:1000000,2384:1000000} {4250:3,4151:50,2384:6} {} {} {} 0 0 0 0 [] [1023]
			50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:4166,223:1000000,181:1000000,2385:1000000} {223:3,181:60,2385:8} {} {} {} 0 0 0 0 [] [1023]
			50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:4166,4251:1000000,4151:1000000,2386:1000000} {4251:3,4151:60,2386:8} {} {} {} 0 0 0 0 [] [1023]