~admin/snxx_server.git

parent: 66ddc7eb | 补丁 | 提交 | ignore whitespace

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

cehua-TT

2019-01-14 ea4f0268501847eb74cee670288e6ec6c47a75e7

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

16个文件已修改

3个文件已添加

	CoreServerGroup/GameServer/Script/ChConfig.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/PyGameData.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CoreServerGroup/GameServer/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagCollectNPC.txt	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 CoreServerGroup/GameServer/Script/ChConfig.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/PyGameData.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagCollectNPC.txt

New file
@@ -0,0 +1,5 @@
NPCID    PrepareTime    LostHPPer    CollectCount    CollectCountLimitNotify    CollectAward

20302001    10    2_2    0    DogzSmallTreasureLimit    [2388,1,1]

20302002    30    2_4    2    DogzBigTreasureLimit    [2387,1,1]

40108001    10    2_2    0    DogzSmallTreasureLimit    [2388,1,1]

40108002    30    2_4    2    DogzBigTreasureLimit    [2387,1,1]

New file
			@@ -0,0 +1,5 @@
			NPCID PrepareTime LostHPPer CollectCount CollectCountLimitNotify CollectAward
			20302001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1]
			20302002 30 2_4 2 DogzBigTreasureLimit [2387,1,1]
			40108001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1]
			40108002 30 2_4 2 DogzBigTreasureLimit [2387,1,1]