~admin/snxx_server.git

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

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

cehua-TT

2018-12-29 2e334a5b4bf09aa72ed0d3b7f81823700dc3d6ec

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

15个文件已修改

	CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSuccess.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PyMongoDataServer.ini	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt

@@ -1,9 +1,3 @@
ZoneID    SeasonID    StartDate    EndDate    EndTime

1    1    2018-10-1    2018-10-30    22:00

1    2    2018-11-1    2018-11-30    22:00

1    3    2018-12-1    2018-12-30    22:00

1    4    2019-1-1    2019-1-30    22:00

1    5    2019-2-1    2019-2-27    22:00

2    3    2018-12-1    2018-12-25    22:00

2    4    2019-1-1    2019-1-25    22:00

2    5    2019-2-1    2019-2-25    22:00

1    1    2018-12-29    2019-1-22    22:00

2    1    2018-12-29    2019-1-22    22:00


 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKZone.txt

@@ -1,3 +1,3 @@
ZoneID    ZoneName    ServerGroupIDList

1    仙界赛区    [(1, 300)]

2    魔界赛区    [(301, 302)]

1    赛区1    [(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]

2    赛区2    [(7022, 7050)]


 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, 5]    180    50		
CrossRealmPKCfg    [100, 10]    180    50		
CrossRealmPKScore    0    [100, 30]    min(cWinCount*10,100)        


 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt

@@ -103,6 +103,6 @@
151    105    0    0

155    300    0    0

156    300    0    0

157    270    0    0

157    200    0    0

158    300    0    0

159    300    0    0


 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PyMongoDataServer.ini

@@ -42,7 +42,7 @@
; 玩家链接跨服的端口

MergeClientPort = 19006



; 跨服服务器自动改名, 策划注意！！！加上玩家名字不可超过33个字节，1个汉字3个字节，字符和英文1个字节

; OpName_平台appid，翻译；不需要改名NameFormat配空

OpName_test = 测试

NameFormat = [%(opname)s%(sid)s服]

; 策划注意！！！加上玩家名字不可超过33个字节，1个汉字3个字节，字符和英文1个字节

; OpName_平台appid_区服ID 获取名字前缀 如 OpName_test_s1 = [测试1服];  最终显示 [测试1服]玩家名

OpName_test_s1 = [测试1服]

OpName_maoer_s1 = [猫耳1服]


 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]]}    {"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]]}		
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]]}		
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            


 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt

@@ -103,6 +103,6 @@
151    105    0    0    0    0

155    300    0    0    0    0

156    300    0    0    0    0

157    270    0    0    0    0

157    200    0    0    0    0

158    300    0    0    0    0

159    300    0    0    0    0

			@@ -1,9 +1,3 @@
			ZoneID SeasonID StartDate EndDate EndTime
			1 1 2018-10-1 2018-10-30 22:00
			1 2 2018-11-1 2018-11-30 22:00
			1 3 2018-12-1 2018-12-30 22:00
			1 4 2019-1-1 2019-1-30 22:00
			1 5 2019-2-1 2019-2-27 22:00
			2 3 2018-12-1 2018-12-25 22:00
			2 4 2019-1-1 2019-1-25 22:00
			2 5 2019-2-1 2019-2-25 22:00
			1 1 2018-12-29 2019-1-22 22:00
			2 1 2018-12-29 2019-1-22 22:00

			@@ -1,3 +1,3 @@
			ZoneID ZoneName ServerGroupIDList
			1 仙界赛区 [(1, 300)]
			2 魔界赛区 [(301, 302)]
			1 赛区1 [(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]
			2 赛区2 [(7022, 7050)]

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

			@@ -103,6 +103,6 @@
			151 105 0 0
			155 300 0 0
			156 300 0 0
			157 270 0 0
			157 200 0 0
			158 300 0 0
			159 300 0 0

			@@ -42,7 +42,7 @@
			; 玩家链接跨服的端口
			MergeClientPort = 19006

			; 跨服服务器自动改名, 策划注意！！！加上玩家名字不可超过33个字节，1个汉字3个字节，字符和英文1个字节
			; OpName_平台appid，翻译；不需要改名NameFormat配空
			OpName_test = 测试
			NameFormat = [%(opname)s%(sid)s服]
			; 策划注意！！！加上玩家名字不可超过33个字节，1个汉字3个字节，字符和英文1个字节
			; OpName_平台appid_区服ID 获取名字前缀如 OpName_test_s1 = [测试1服]; 最终显示 [测试1服]玩家名
			OpName_test_s1 = [测试1服]
			OpName_maoer_s1 = [猫耳1服]

			@@ -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]]} {"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]]}
			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]]}
			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

			@@ -103,6 +103,6 @@
			151 105 0 0 0 0
			155 300 0 0 0 0
			156 300 0 0 0 0
			157 270 0 0 0 0
			157 200 0 0 0 0
			158 300 0 0 0 0
			159 300 0 0 0 0