From 74e1ac435371bc1ec586040ba39f9b8e288e7894 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期一, 14 一月 2019 17:36:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 72a1aa8..8082278 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -276,6 +276,7 @@
 XMZZRobot	[30403002,30403003,30403004]	30403001			
 XMZZRobotSkill	{1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}				
 XMZZPKAward	[0,10,20,30,40,50,60,70,80,90]	addPer+100 + int(math.ceil(HPPer/10.0))	50	reExp*216*(100+addPer)/100	reExp*108
+CollectNPC	[[20302002, 40108002],[20302001, 40108001]]				
 PayRMB	10				
 OSCBillboardOpen	{"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[12,5,5],"7":[50,6,6],"6":[1200000,7,7]}	10			
 OSCRankRedpackAward	{1:80,(2,5):81}				

--
Gitblit v1.8.0