From 61408a3d79ee57e54ac72d34d3a2ce79d3523282 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 12 十一月 2018 17:50:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt | 60 +++++++++++++++---------------
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 3 +
CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt | 6 +-
3 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 0917266..c8e39d9 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -608,6 +608,9 @@
31601001 上古魔物 110
31601002 上古魔物 200
31601003 上古魔物 300
+31604001 110级机器人 200
+31604002 200级机器人 200
+31604003 300级机器人 200
31701000 不稳定魂体 25
31701001 恶狼 25
31701002 狂豹 25
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index 1bb07da..54cbf8a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -12,9 +12,9 @@
11 31230 5 20 0 20 15 1 1 {}
12 31230 6 20 0 20 15 1 1 {}
13 31230 7 20 0 20 15 1 1 {}
-14 31160 2 20 30 21 0 1 1 {}
-15 31160 4 20 30 21 0 1 1 {}
-16 31160 6 20 30 21 0 1 1
+14 31160 2 20 30 20 50 1 1 {}
+15 31160 4 20 30 20 50 1 1 {}
+16 31160 6 20 30 20 50 1 1
17 31220 5 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
18 31220 5 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
19 31220 5 21 21 21 25 0 13 {}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
index 09efa99..f755c2a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
@@ -10,12 +10,12 @@
9 1 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
10 1 9 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
11 1 13 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-12 1 3 31160 20 30 21 0 1 1 {}
-13 1 5 31160 20 30 21 0 1 1 {}
-14 1 7 31160 20 30 21 0 1 1 {}
-15 1 9 31160 20 30 21 0 1 1 {}
-16 1 11 31160 20 30 21 0 1 1 {}
-17 1 13 31160 20 30 21 0 1 1 {}
+12 1 3 31160 20 30 20 50 1 1 {}
+13 1 5 31160 20 30 20 50 1 1 {}
+14 1 7 31160 20 30 20 50 1 1 {}
+15 1 9 31160 20 30 20 50 1 1 {}
+16 1 11 31160 20 30 20 50 1 1 {}
+17 1 13 31160 20 30 20 50 1 1 {}
18 1 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
19 1 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
20 1 3 31220 21 21 21 25 0 13 {}
@@ -56,11 +56,11 @@
55 2 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
56 2 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
57 2 12 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-58 2 3 31160 20 30 21 0 1 1 {}
-59 2 5 31160 20 30 21 0 1 1 {}
-60 2 8 31160 20 30 21 0 1 1 {}
-61 2 10 31160 20 30 21 0 1 1 {}
-62 2 12 31160 20 30 21 0 1 1 {}
+58 2 3 31160 20 30 20 50 1 1 {}
+59 2 5 31160 20 30 20 50 1 1 {}
+60 2 8 31160 20 30 20 50 1 1 {}
+61 2 10 31160 20 30 20 50 1 1 {}
+62 2 12 31160 20 30 20 50 1 1 {}
63 2 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
64 2 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
65 2 3 31220 21 21 21 25 0 13 {}
@@ -100,11 +100,11 @@
99 3 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
100 3 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
101 3 11 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-102 3 3 31160 20 30 21 0 1 1 {}
-103 3 5 31160 20 30 21 0 1 1 {}
-104 3 7 31160 20 30 21 0 1 1 {}
-105 3 9 31160 20 30 21 0 1 1 {}
-106 3 11 31160 20 30 21 0 1 1 {}
+102 3 3 31160 20 30 20 50 1 1 {}
+103 3 5 31160 20 30 20 50 1 1 {}
+104 3 7 31160 20 30 20 50 1 1 {}
+105 3 9 31160 20 30 20 50 1 1 {}
+106 3 11 31160 20 30 20 50 1 1 {}
107 3 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
108 3 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
109 3 3 31220 21 21 21 25 0 13 {}
@@ -140,10 +140,10 @@
139 4 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
140 4 6 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
141 4 10 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-142 4 3 31160 20 30 21 0 1 1 {}
-143 4 6 31160 20 30 21 0 1 1 {}
-144 4 8 31160 20 30 21 0 1 1 {}
-145 4 10 31160 20 30 21 0 1 1 {}
+142 4 3 31160 20 30 20 50 1 1 {}
+143 4 6 31160 20 30 20 50 1 1 {}
+144 4 8 31160 20 30 20 50 1 1 {}
+145 4 10 31160 20 30 20 50 1 1 {}
146 4 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
147 4 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
148 4 3 31220 21 21 21 25 0 13 {}
@@ -177,10 +177,10 @@
176 5 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
177 5 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
178 5 9 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-179 5 3 31160 20 30 21 0 1 1 {}
-180 5 5 31160 20 30 21 0 1 1 {}
-181 5 7 31160 20 30 21 0 1 1 {}
-182 5 9 31160 20 30 21 0 1 1 {}
+179 5 3 31160 20 30 20 50 1 1 {}
+180 5 5 31160 20 30 20 50 1 1 {}
+181 5 7 31160 20 30 20 50 1 1 {}
+182 5 9 31160 20 30 20 50 1 1 {}
183 5 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
184 5 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
185 5 3 31220 21 21 21 25 0 13 {}
@@ -211,9 +211,9 @@
210 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
211 6 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
212 6 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-213 6 3 31160 20 30 21 0 1 1 {}
-214 6 5 31160 20 30 21 0 1 1 {}
-215 6 8 31160 20 30 21 0 1 1 {}
+213 6 3 31160 20 30 20 50 1 1 {}
+214 6 5 31160 20 30 20 50 1 1 {}
+215 6 8 31160 20 30 20 50 1 1 {}
216 6 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
217 6 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
218 6 3 31220 21 21 21 25 0 13 {}
@@ -243,9 +243,9 @@
242 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
243 7 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
244 7 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-245 7 3 31160 20 30 21 0 1 1 {}
-246 7 5 31160 20 30 21 0 1 1 {}
-247 7 7 31160 20 30 21 0 1 1 {}
+245 7 3 31160 20 30 20 50 1 1 {}
+246 7 5 31160 20 30 20 50 1 1 {}
+247 7 7 31160 20 30 20 50 1 1 {}
248 7 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
249 7 3 31220 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
250 7 3 31220 21 21 21 25 0 13 {}
--
Gitblit v1.8.0