From da20254cdf6d5dab2f66a8c70bd5962a05843d0b Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 19 十一月 2018 11:40:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt       |    2 +-
 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index b811d76..1b666a2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -2,24 +2,24 @@
 10403001	10040	int(300*(1-0.089*min(max(yesterdayCnt-1,0),9)))	[115,155]	40	5	2000	100	世界BOSS
 20103001	21070	int(450*(1-0.089*min(max(yesterdayCnt-1,0),9)))	[115,175]	40	5	2005	100	世界BOSS
 20103002	21070	int(900*(1-0.096*min(max(yesterdayCnt-1,0),9)))	[125,195]	40	5	2006	100	世界BOSS
-20103003	21070	int(1200*(1-0.056*min(max(yesterdayCnt-5,0),15)))	[140,190]	40	5	2007	100	世界BOSS
-20103004	21070	int(1500*(1-0.037*min(max(yesterdayCnt-8,0),22)))	[160,210]	40	5	2008	100	世界BOSS
+20103003	21070	int(1200*(1-0.056*min(max(yesterdayCnt-5,0),15)))	[140,170]	40	5	2007	100	世界BOSS
+20103004	21070	int(1500*(1-0.037*min(max(yesterdayCnt-8,0),22)))	[160,190]	40	5	2008	100	世界BOSS
 10503001	10050	int(1500*(1-0.02*min(max(yesterdayCnt-10,0),40)))	[180,230]	40	5	2001	100	世界BOSS
-20103005	21070	int(1800*(1-0.011*min(max(yesterdayCnt-30,0),70)))	[195,245]	40	5	2009	100	世界BOSS
-20103006	21070	int(2100*(1-0.007*min(max(yesterdayCnt-30,0),120)))	[210,260]	40	5	2010	100	世界BOSS
+20103005	21070	int(1800*(1-0.011*min(max(yesterdayCnt-30,0),70)))	[195,225]	40	5	2009	100	世界BOSS
+20103006	21070	int(2100*(1-0.007*min(max(yesterdayCnt-30,0),120)))	[210,240]	40	5	2010	100	世界BOSS
 10603001	10060	int(2100*(1-0.013*min(max(yesterdayCnt-30,0),50)))	[230,300]	40	5	2002	100	世界BOSS
-20203001	21100	int(3300*(1-0.015*min(max(yesterdayCnt-25,0),55)))	[235,285]	40	5	2012	100	世界BOSS
-20203002	21100	int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95)))	[240,290]	40	5	2013	100	世界BOSS
-20103007	21070	int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95)))	[245,295]	40	5	2011	100	世界BOSS
+20203001	21100	int(3300*(1-0.015*min(max(yesterdayCnt-25,0),55)))	[235,265]	40	5	2012	100	世界BOSS
+20203002	21100	int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95)))	[240,270]	40	5	2013	100	世界BOSS
+20103007	21070	int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95)))	[245,275]	40	5	2011	100	世界BOSS
 10703001	10070	int(3600*(1-0.012*min(max(yesterdayCnt-25,0),55)))	[280,350]	40	5	2003	100	世界BOSS
-20203003	21100	int(4200*(1-0.02*min(max(yesterdayCnt-20,0),40)))	[285,335]	40	5	2014	100	世界BOSS
-20203004	21100	int(4800*(1-0.015*min(max(yesterdayCnt-20,0),55)))	[290,340]	40	5	2015	100	世界BOSS
+20203003	21100	int(4200*(1-0.02*min(max(yesterdayCnt-20,0),40)))	[285,315]	40	5	2014	100	世界BOSS
+20203004	21100	int(4800*(1-0.015*min(max(yesterdayCnt-20,0),55)))	[290,320]	40	5	2015	100	世界BOSS
 10803001	10080	int(4800*(1-0.017*min(max(yesterdayCnt-20,0),40)))	[330,400]	40	5	2004	100	世界BOSS
-20203005	21100	int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25)))	[335,385]	40	5	2016	100	世界BOSS
-20203006	21100	int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35)))	[340,390]	40	5	2017	100	世界BOSS
+20203005	21100	int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25)))	[335,365]	40	5	2016	100	世界BOSS
+20203006	21100	int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35)))	[340,370]	40	5	2017	100	世界BOSS
 10903001	10090	int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25)))	[380,450]	40	5	2048	100	世界BOSS
-11003001	10100	int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25)))	[380,450]	40	5	2047	100	世界BOSS
-20203007	21100	int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35)))	[385,435]	40	5	2018	100	世界BOSS
+20203007	21100	int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35)))	[385,415]	40	5	2018	100	世界BOSS
+11003001	10100	int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25)))	[430,500]	40	5	2047	100	世界BOSS
 11103001	10110	int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35)))	[430,500]	40	5	2049	100	世界BOSS
 20303001	21110	3000	[1,500]	40	5	2040	100	世界BOSS
 20303002	21110	3600	[1,500]	40	5	2041	100	世界BOSS
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index 48f3073..8a86537 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -18,8 +18,8 @@
 20203005	21100	94	0	0	0	2016
 20203006	21100	95	0	0	0	2017
 10903001	10090	90	0	0	0	2048
-11003001	10100	90	0	0	0	2047
 20203007	21100	96	0	0	0	2018
+11003001	10100	90	0	0	0	2047
 11103001	10110	90	0	0	0	2049
 20303001	21110	90	0	0	0	2040
 20303002	21110	91	0	0	0	2041

--
Gitblit v1.8.0