From f525ee60280758402cb8241c2523a376f7526118 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期三, 14 十一月 2018 14:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

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

diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index f358a0f..9abd03e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -98,7 +98,7 @@
 GodWeapon2	104|105|106	0	0	0	0
 GodWeapon3	107|108|109	0	0	0	0
 GodWeapon4	110|111|112	0	0	0	0
-GodWeaponActive	1	0	0	0	0
+GodWeaponActive	1	{"2":[[1,10]], "3":[[1,15], [2,10]], "4":[[2,20], [3,10]]}	0	0	0
 GodWeaponSys	{1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2'}				
 GodLv	{1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}				
 WorldLvExpRate	int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000)	0	0	0	0
@@ -190,7 +190,7 @@
 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			
-RunTaskAward	{7:[3,200000,1500000]}	{7:[100,9999999]}	{"12":[[28,50,1],[2213,10,1]]}	{"12":'5625*reExp'}	2103
+RunTaskAward	{7:[3,200000,1500000]}	{7:[100,9999999]}	{"12":[[28,50,1],[2324,1,1]]}	{"12":'5625*reExp'}	2103
 RunTaskExp	reExp*baseExp				
 RunTaskAwardTaskID	{7:2009,12:3009}				
 MoneyPray	10+min(max(cnt-2,0),1)*5+min(max(cnt-4,0),1)*5+min(max(cnt-6,0),1)*10+min(max(cnt-8,0),1)*10+min(max(cnt-10,0),1)*10+min(max(cnt-12,0),1)*10+min(max(cnt-14,0),1)*10+min(max(cnt-16,0),1)*10	1000000	28800	[1,1000000]	

--
Gitblit v1.8.0