~admin/snxx_server.git

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

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

cehua_lgq

2018-08-23 110ead1bf788621baea739037a84c65fb0162ab7

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

6个文件已修改

	ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.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/EventShell.pyc

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -174,7 +174,7 @@
VIPPanel    1_170|2_158|3_157|4_159|5_160|6_161|7_162|8_163|9_164|10_165                

VIPRedPackAward    {1:52,2:53,3:54,4:55,5:56,6:57,7:58,8:59,9:60,10:61}                

RebornArguments    5|60|20|20    31160            

DuplicatesRebornTime    0_10|31090_5|31160_5|31150_0				
DuplicatesRebornTime    0_10|31090_5|31160_5|31150_0    31150_10			
AutoBuyDrug    251|252|253|254                

RunTaskKillNPCCnt    {(50,80):40,(81,100):45,(101,120):50,(121,140):55,(141,160):60,(161,180):65,(180,200):70,(201,220):75,(221,2000):80}                

RunTaskCnt    7_20|12_70    7_10|12_10

			@@ -174,7 +174,7 @@
			VIPPanel 1_170\|2_158\|3_157\|4_159\|5_160\|6_161\|7_162\|8_163\|9_164\|10_165
			VIPRedPackAward {1:52,2:53,3:54,4:55,5:56,6:57,7:58,8:59,9:60,10:61}
			RebornArguments 5\|60\|20\|20 31160
			DuplicatesRebornTime 0_10\|31090_5\|31160_5\|31150_0
			DuplicatesRebornTime 0_10\|31090_5\|31160_5\|31150_0 31150_10
			AutoBuyDrug 251\|252\|253\|254
			RunTaskKillNPCCnt {(50,80):40,(81,100):45,(101,120):50,(121,140):55,(141,160):60,(161,180):65,(180,200):70,(201,220):75,(221,2000):80}
			RunTaskCnt 7_20\|12_70 7_10\|12_10