~admin/snxx_server.git

parent: 7ede7a55 | 补丁 | 提交 | show whitespace

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

cehua-TT

2018-12-28 c410de5116f081c06433e5a0d68e4a454a914622

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

6个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagDailyQuest.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKDan.txt

@@ -4,29 +4,29 @@
2    600    [0,5]

3    800    [0,5]

4    1000    [1,5]

5    1480    [2,6]

6    1960    [3,7]

7    2440    [4,8]

8    2920    [5,9]

9    3400    [6,10]

10    4360    [7,11]

11    5320    [8,12]

12    6280    [9,13]

13    7240    [10,14]

14    8200    [11,15]

15    9740    [12,16]

16    11280    [13,17]

17    12810    [14,18]

18    14350    [15,19]

19    15880    [16,20]

20    18040    [17,21]

21    20190    [18,22]

22    22340    [19,23]

23    24490    [20,24]

24    26640    [21,25]

25    29230    [22,26]

26    31810    [24,27]

27    34390    [25,28]

28    36970    [26,29]

29    39550    [27,30]

5    1500    [2,6]

6    2000    [3,7]

7    2500    [4,8]

8    3000    [5,9]

9    3500    [6,10]

10    4500    [7,11]

11    5500    [8,12]

12    6500    [9,13]

13    7500    [10,14]

14    8500    [11,15]

15    10000    [12,16]

16    11500    [13,17]

17    13000    [14,18]

18    14500    [15,19]

19    16000    [16,20]

20    18000    [17,21]

21    20000    [18,22]

22    22000    [19,23]

23    24000    [20,24]

24    26000    [21,25]

25    28400    [22,26]

26    30800    [24,27]

27    33200    [25,28]

28    35600    [26,29]

29    38000    [27,30]

30    0    [28,30]


 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt

@@ -78,5 +78,5 @@
PlayerViewCache    100    [0,4]            

CrossRealmCfg    5                

CrossRealmPKMatch    5    3    60    [32010,32011]    [(10, 7), (40,37)]

CrossRealmPKCfg    [100, 10]    180    50		
CrossRealmPKCfg    [100, 5]    180    50		
CrossRealmPKScore    0    [100, 30]    min(cWinCount*10,100)        


 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt

@@ -27,4 +27,4 @@
28    1    18    108    50    1    50

29    1    20    151    1    20    20

30    2    31340    156    1    20    40

31    1    21    157    1    10    100

31    1    21    157    1    5    50


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -322,7 +322,7 @@
HelpBattlePoint    1400    {"1":[8, 8], "2":[8, 8]}    1|2        

HelpBattleRobot    50105026    baseHurt*hpCoefficient            

CrossRealmCfg    5                

CrossRealmPKAward    {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}    {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}    {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
CrossRealmPKAward    {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}    {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}    {"3":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "10":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "20":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
CrossRealmPKMatchCount    10    10    10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*20+min(max(todayBuyCount-5,0),1)*40+min(max(todayBuyCount-7,0),1)*40        

CrossRealmPKFB    [30, 3, 60,30,10]    [[14,18,19,11,42], [30,33,36,28,50]]    2        

GatherSoulHole    0_300|1_300|2_305|3_315|4_320|5_325|6_310    0_62|1_62|2_62|3_62|4_62|5_62|6_63

			@@ -4,29 +4,29 @@
			2 600 [0,5]
			3 800 [0,5]
			4 1000 [1,5]
			5 1480 [2,6]
			6 1960 [3,7]
			7 2440 [4,8]
			8 2920 [5,9]
			9 3400 [6,10]
			10 4360 [7,11]
			11 5320 [8,12]
			12 6280 [9,13]
			13 7240 [10,14]
			14 8200 [11,15]
			15 9740 [12,16]
			16 11280 [13,17]
			17 12810 [14,18]
			18 14350 [15,19]
			19 15880 [16,20]
			20 18040 [17,21]
			21 20190 [18,22]
			22 22340 [19,23]
			23 24490 [20,24]
			24 26640 [21,25]
			25 29230 [22,26]
			26 31810 [24,27]
			27 34390 [25,28]
			28 36970 [26,29]
			29 39550 [27,30]
			5 1500 [2,6]
			6 2000 [3,7]
			7 2500 [4,8]
			8 3000 [5,9]
			9 3500 [6,10]
			10 4500 [7,11]
			11 5500 [8,12]
			12 6500 [9,13]
			13 7500 [10,14]
			14 8500 [11,15]
			15 10000 [12,16]
			16 11500 [13,17]
			17 13000 [14,18]
			18 14500 [15,19]
			19 16000 [16,20]
			20 18000 [17,21]
			21 20000 [18,22]
			22 22000 [19,23]
			23 24000 [20,24]
			24 26000 [21,25]
			25 28400 [22,26]
			26 30800 [24,27]
			27 33200 [25,28]
			28 35600 [26,29]
			29 38000 [27,30]
			30 0 [28,30]

			@@ -78,5 +78,5 @@
			PlayerViewCache 100 [0,4]
			CrossRealmCfg 5
			CrossRealmPKMatch 5 3 60 [32010,32011] [(10, 7), (40,37)]
			CrossRealmPKCfg [100, 10] 180 50
			CrossRealmPKCfg [100, 5] 180 50
			CrossRealmPKScore 0 [100, 30] min(cWinCount*10,100)

			@@ -27,4 +27,4 @@
			28 1 18 108 50 1 50
			29 1 20 151 1 20 20
			30 2 31340 156 1 20 40
			31 1 21 157 1 10 100
			31 1 21 157 1 5 50

			@@ -322,7 +322,7 @@
			HelpBattlePoint 1400 {"1":[8, 8], "2":[8, 8]} 1\|2
			HelpBattleRobot 50105026 baseHurt*hpCoefficient
			CrossRealmCfg 5
			CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
			CrossRealmPKAward {"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]} {"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]} {"3":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "10":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "20":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}
			CrossRealmPKMatchCount 10 10 10+min(max(todayBuyCount-1,0),1)10+min(max(todayBuyCount-3,0),1)20+min(max(todayBuyCount-5,0),1)40+min(max(todayBuyCount-7,0),1)40
			CrossRealmPKFB [30, 3, 60,30,10] [[14,18,19,11,42], [30,33,36,28,50]] 2
			GatherSoulHole 0_300\|1_300\|2_305\|3_315\|4_320\|5_325\|6_310 0_62\|1_62\|2_62\|3_62\|4_62\|5_62\|6_63