~admin/snxx_server.git

parent: 22674547 | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2019-01-10 f148f0f835c4a18cb226fa7ff1bf4bae7f5c83c5

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

18个文件已修改

	CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.map	206230 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.exe	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.map	219018 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.tds	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPrestigeSys.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServer.tds

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.exe

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.map

Diff too large

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ChinMapServerDM.tds

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_SetPlayerAttr.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -219,7 +219,7 @@
BossHomeCost    1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200    0    0    0    0

BossShunt    10040|21070    1    3        

MapLine    10040_10|10080_10|21070_1    10010_11|10020_11|10030_11|10080_11|10040_26    [10103001,10203001,10303001,10403001]    21070|21100|21110|32020    

NeutralMapExpAward    {(21070,21100,21110):[500,'int(0.6*reExp)']}				
NeutralMapExpAward    {(21070,21100,21110,32020):[500,'int(0.6*reExp)']}				
DungeonDeliver    31020|31030|31150|31031                

DungeonIntegral    2000                

BuyFBCntCost    {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50"}

			@@ -219,7 +219,7 @@
			BossHomeCost 1_0\|2_100\|3_200\|4_200\|5_200\|6_200\|7_200\|8_200 0 0 0 0
			BossShunt 10040\|21070 1 3
			MapLine 10040_10\|10080_10\|21070_1 10010_11\|10020_11\|10030_11\|10080_11\|10040_26 [10103001,10203001,10303001,10403001] 21070\|21100\|21110\|32020
			NeutralMapExpAward {(21070,21100,21110):[500,'int(0.6*reExp)']}
			NeutralMapExpAward {(21070,21100,21110,32020):[500,'int(0.6*reExp)']}
			DungeonDeliver 31020\|31030\|31150\|31031
			DungeonIntegral 2000
			BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)10+min(max(hasBuyCnt-3,0),1)10+min(max(hasBuyCnt-5,0),1)10+min(max(hasBuyCnt-7,0),1)10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50"}