From c307b507584aafb8c98a248afee6d0c2e840d721 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 08 十月 2018 15:59:14 +0800
Subject: [PATCH] Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18
---
db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt | 20 ++++++++++----------
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt | 1 +
db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt | 24 ++++++++++++------------
5 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index c160a52..a03c712 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -633,7 +633,7 @@
31903003 潮汐巨兽 250
31903004 极炎巨兽 300
31903005 白泽 350
-31903006 山寨天枢 400
+31903006 蔚寒魔将 400
31903007 山寨天枢 450
31903008 山寨天枢 500
31903009 山寨天枢 550
diff --git a/db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt b/db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt
index d79f76a..c34476e 100644
--- a/db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAllPeopleParty.txt
@@ -1,14 +1,14 @@
ID TotalTimes AddPoint
-1 10 25
-2 10 20
-3 10 5
-4 2 20
+1 10 10
5 3 25
6 20 1
-7 3 15
-8 12 5
-9 1 20
+8 10 5
+7 3 25
+4 1 20
10 10 5
-11 3 10
-12 2 20
-13 2 20
+9 1 20
+12 2 25
+13 2 25
+11 10 5
+2 10 5
+3 10 2
diff --git a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
index 04ff3e5..9a3eab4 100644
--- a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
@@ -1,16 +1,16 @@
WorldLvNum Index NeedPoint Award
-0 0 140 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-0 1 260 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
+0 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
+0 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
0 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-0 3 400 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-0 4 480 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 0 140 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-1 1 260 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
+0 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+0 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+1 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
+1 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
1 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-1 3 400 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 4 480 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 0 140 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-2 1 260 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
+1 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+1 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+2 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
+2 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
2 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-2 3 400 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 4 480 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+2 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+2 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt b/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
index b5c86fe..1a973a4 100644
--- a/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
@@ -4,3 +4,4 @@
31903003 200
31903004 250
31903005 300
+31903006 350
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 8b01bb8..ef8c54d 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -633,7 +633,7 @@
31903003 2 0 潮汐巨兽 250 0 3712 3712 2853 8 0 0 10000 1709 0 0 0 0 0 0 0 0 3000 1270711 33 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8495308 0 0 0 0 3 0 0 1 1 1
31903004 2 0 极炎巨兽 300 0 5720 5720 6491 11 0 0 10000 3466 0 0 0 0 0 0 0 0 3000 1683526 39 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26472904 0 0 0 0 3 0 0 1 1 1
31903005 2 0 白泽 350 0 8947 8947 12066 15 0 0 10000 5611 0 0 0 0 0 0 0 0 3000 2096341 45 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 64642293 0 0 0 0 3 0 0 1 1 1
-31903006 2 0 山寨天枢 400 0 13219 13219 19125 20 0 0 10000 8805 0 0 0 0 0 0 0 0 3000 2167516 50 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 42294584 1 0 0 0 3 0 0 1 1 1
+31903006 2 0 蔚寒魔将 400 0 13219 13219 19125 20 0 0 10000 8805 0 0 0 0 0 0 0 0 3000 2167516 50 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 42294584 1 0 0 0 3 0 0 1 1 1
31903007 2 0 山寨天枢 450 0 23637 23637 27488 22 0 0 10000 12585 0 0 0 0 0 0 0 0 3000 2238691 55 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 78921359 2 0 0 0 3 0 0 1 1 1
31903008 2 0 山寨天枢 500 0 32023 32023 35414 21 0 0 10000 15901 0 0 0 0 0 0 0 0 3000 2309866 60 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 28427855 4 0 0 0 3 0 0 1 1 1
31903009 2 0 山寨天枢 550 0 40297 40297 38423 21 0 0 10000 18295 0 0 0 0 0 0 0 0 3000 2381041 65 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 19494464 5 0 0 0 3 0 0 1 1 1
--
Gitblit v1.8.0