~admin/snxx_server.git

parent: 1cd5ce69 | 补丁 | 提交 | ignore whitespace

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

cehua_wcy

2018-08-23 f06e935b8072760e1c2817b36a0edfa07f45220e

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

9个文件已修改

	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	db/PyMongoDataServer/PySysDB/tagFuncConfig.txt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -281,4 +281,4 @@
CeremonyRecharge    {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}                

CeremonyFireParty    {"0":801,"1":802,"2":803}                

CeremonyRankLimit    3280                

TJDropTaskItem    {20007:[120,1101,100,'killCnt']}				
TJDropTaskItem    {20007:[120,1104,100,'killCnt']}

			@@ -281,4 +281,4 @@
			CeremonyRecharge {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}
			CeremonyFireParty {"0":801,"1":802,"2":803}
			CeremonyRankLimit 3280
			TJDropTaskItem {20007:[120,1101,100,'killCnt']}
			TJDropTaskItem {20007:[120,1104,100,'killCnt']}